diff --git a/src/search/symbolic/searches/uniform_cost_search.cc b/src/search/symbolic/searches/uniform_cost_search.cc
index 329529e02..2a6fa0c30 100644
--- a/src/search/symbolic/searches/uniform_cost_search.cc
+++ b/src/search/symbolic/searches/uniform_cost_search.cc
@@ -155,7 +155,10 @@ void UniformCostSearch::stepImage(int maxTime, int maxNodes) {
             }
         }
     }
-    prepareBucket();
+    
+    while (!frontier.bucketReady() && !open_list.empty()) {
+        prepareBucket();
+    }
 
     engine->setLowerBound(getG() + mgr->getAbsoluteMinTransitionCost());
     step_estimation.set_data(step_timer(), stepNodes, !res_expansion.ok);