diff --git a/Essentials/src/main/java/com/earth2me/essentials/Kit.java b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
index 895b13d8220..681a536f597 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Kit.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
@@ -266,12 +266,12 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 
             for (final ItemStack itemStack : leftover.values()) {
                 int spillAmount = itemStack.getAmount();
+                final int itemMaxStackSize = itemStack.getMaxStackSize();
                 while (spillAmount > 0) {
-                    if (maxStackSize != 0) {
-                        itemStack.setAmount(Math.min(spillAmount, itemStack.getMaxStackSize()));
-                    }
-                    user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
-                    spillAmount -= itemStack.getAmount();
+                    final ItemStack spillStack = itemStack.clone();
+                    spillStack.setAmount(Math.min(spillAmount, itemMaxStackSize));
+                    user.getWorld().dropItemNaturally(user.getLocation(), spillStack);
+                    spillAmount -= spillStack.getAmount();
                 }
                 spew = true;
             }