diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java
index 313eb0d7..ea4bd637 100644
--- a/src/engine/gameManager/ForgeManager.java
+++ b/src/engine/gameManager/ForgeManager.java
@@ -84,8 +84,10 @@ public enum ForgeManager implements Runnable {
     }
 
     public static void submit(WorkOrder workOrder) {
+
         workOrder.workOrderID = wordOrderCounter.incrementAndGet();
         workOrder.completionTime = System.currentTimeMillis() + workOrder.rollingDuration;
+        workOrder.slotCount = calcAvailableSlots(workOrder);
 
         // Single item rolls are total_to_produce of 0;
 
diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
index f07ecb0b..308a4209 100644
--- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
@@ -87,7 +87,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                 workOrder.suffixToken = msg.sToken;
                 workOrder.itemName = msg.name;
                 workOrder.rollingDuration = ForgeManager.calcRollingDuration(workOrder);
-                workOrder.slotCount = ForgeManager.calcAvailableSlots(workOrder);
+                workOrder.slotCount = 0;
 
                 // Validate vendor can roll this item