diff --git a/apps/ai-game-creator-shell/src-tauri/src/ui_editor/commands/separation/workflow.rs b/apps/ai-game-creator-shell/src-tauri/src/ui_editor/commands/separation/workflow.rs
index 3ca8fc937..2d3cbb5ff 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/ui_editor/commands/separation/workflow.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/ui_editor/commands/separation/workflow.rs
@@ -87,7 +87,7 @@ fn mark_batch_problematic(
         state.problematic_nodes.push(ProblematicNode {
             node_id: node.id.clone(),
             problem_description: error.clone(),
-            rework_count: MAX_REWORK_COUNT,
+            rework_count: node.rework_count,
         });
     }
     if let Some(tree) = state.unprocessed_trees.get_mut(tree_index) {
@@ -313,7 +313,8 @@ pub(crate) async fn separate_ui_impl(
     } else {
         construct_separation_state(&state)
     };
-    for (tree_index, tree) in separation.unprocessed_trees.clone().iter().enumerate() {
+    for tree_index in 0..separation.unprocessed_trees.len() {
+        let tree = &separation.unprocessed_trees[tree_index];
         let image = state
             .ui_design_images
             .get(&tree.src_ui_design)