diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java
index 787d3023..df62a6fa 100644
--- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java
+++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java
@@ -64,7 +64,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
             {
                 this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
                 par1EntityPlayer.onItemPickup(this, 1);
-                this.setDead();
+                if(returnStack.stackSize <= 0)
+                    this.setDead();
             }
         }
     }