diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java
index e4f0a962..f98c7565 100644
--- a/src/engine/gameManager/ForgeManager.java
+++ b/src/engine/gameManager/ForgeManager.java
@@ -85,7 +85,6 @@ public enum ForgeManager implements Runnable {
             // enQueue this workOrder again; back into the oven
             // until all items for this workOrder are completed.
 
-            workOrder.completionTime = System.currentTimeMillis() + workOrder.rollingDuration;
             forge.add(workOrder);
 
             // Debugging
@@ -335,6 +334,10 @@ public enum ForgeManager implements Runnable {
 
     public static void forgeWorkerOrderBatch(WorkOrder workOrder) {
 
+        // New completion time for this batch
+
+        workOrder.completionTime = System.currentTimeMillis() + workOrder.rollingDuration;
+
         for (int i = 0; i < workOrder.slots_used; ++i) {
 
             Item forged_item = forgeItem(workOrder);