diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index ae0c1f5393..f1d21afa2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -53,13 +53,13 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
             if (item == null || item.getTypeId() <= 0) {
                 mcItems[i] = null;
             } else {
-                mcItems[i] = new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability());
+                mcItems[i] = CraftItemStack.createNMSItemStack(item);
             }
         }
     }
 
     public void setItem(int index, ItemStack item) {
-        getInventory().setItem(index, (item == null ? null : new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability())));
+        getInventory().setItem(index, (item == null ? null : CraftItemStack.createNMSItemStack(item)));
     }
 
     public boolean contains(int materialId) {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index e94bf891f9..9ee0a3fea4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -207,4 +207,8 @@ public class CraftItemStack extends ItemStack {
     public net.minecraft.server.ItemStack getHandle() {
         return item;
     }
+
+    public static net.minecraft.server.ItemStack createNMSItemStack(ItemStack original) {
+        return new CraftItemStack(original).getHandle();
+    }
 }