diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java
index fa3dc66f..545e4060 100644
--- a/src/engine/gameManager/ForgeManager.java
+++ b/src/engine/gameManager/ForgeManager.java
@@ -41,8 +41,6 @@ public enum ForgeManager implements Runnable {
 
                     // if Prefix and suffix are null random roll item
                     // otherwise roll what was asked for
-
-                    workOrder.total_to_produce = workOrder.total_to_produce - 1;
                 }
 
                 if (workOrder.total_to_produce == 0) {
@@ -57,6 +55,9 @@ public enum ForgeManager implements Runnable {
                 // Resubmit workOrder
 
                 workOrder.completionTime = System.currentTimeMillis() + 10000;
+                workOrder.total_to_produce = workOrder.total_to_produce - 1;
+                workOrders.add(workOrder);
+
                 Logger.info("Workorder has cycled: " + workOrder.workOrderID);
             } catch (InterruptedException e) {
                 e.printStackTrace();