diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
index c6dd3bc92..3e78fb541 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
@@ -63,15 +63,14 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
 				this.lastAmount = this.amount;
 			}
 
-			if(this.amount >= this.getCapacity()) {
-				// In case of overfill problems, spit out the excess as scrap
-				if(amount > getCapacity()) {
-					ItemStack scrap = ItemScraps.create(new Mats.MaterialStack(type, amount));
-					EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 2, zCoord + 0.5, scrap);
-					worldObj.spawnEntityInWorld(item);
-				}
-				this.amount = this.getCapacity();
-
+            if (this.amount >= this.getCapacity()) {
+                //In case of overfill problems, spit out the excess as scrap
+                if (amount > getCapacity()) {
+                    ItemStack scrap = ItemScraps.create(new Mats.MaterialStack(type, Math.max(amount - getCapacity(), 0)));
+                    EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 2, zCoord + 0.5, scrap);
+                    worldObj.spawnEntityInWorld(item);
+                }
+                this.amount = this.getCapacity();
 			}
 
 			if(this.amount == 0) {