diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java
index 814bba45..c0193c68 100644
--- a/src/engine/gameManager/ForgeManager.java
+++ b/src/engine/gameManager/ForgeManager.java
@@ -119,9 +119,9 @@ public enum ForgeManager implements Runnable {
 
         int availableSlots = workOrder.vendor.getRank();
 
-        for (WorkOrder npcWorkOrder : workOrder.vendor.workOrders) {
+        for (WorkOrder npcWorkOrder : workOrder.vendor.workOrders)
+            availableSlots = availableSlots - npcWorkOrder.slotCount;
 
-        }
         return availableSlots;
     }
 }
diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
index 2da4d985..c8a62ece 100644
--- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
@@ -87,6 +87,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                 workOrder.suffixToken = msg.sToken;
                 workOrder.itemName = msg.name;
                 workOrder.rollingDuration = ForgeManager.calcRollingDuration(workOrder);
+                workOrder.slotCount = ForgeManager.getAvailableSlots(workOrder);
 
                 // Validate vendor can roll this item