diff --git a/src/main/java/refinedstorage/storage/NBTStorage.java b/src/main/java/refinedstorage/storage/NBTStorage.java
index 7a80cb857..97a358d7f 100755
--- a/src/main/java/refinedstorage/storage/NBTStorage.java
+++ b/src/main/java/refinedstorage/storage/NBTStorage.java
@@ -92,7 +92,7 @@ public abstract class NBTStorage implements IStorage {
             }
         }
 
-        stacks.add(stack);
+        stacks.add(stack.copy());
 
         markDirty();
     }
diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java
index 47c07da5a..4b30b2628 100755
--- a/src/main/java/refinedstorage/tile/TileExternalStorage.java
+++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java
@@ -68,7 +68,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
 
         if (storageUnit != null) {
             if (storageUnit.getStoredItemType() == null) {
-                storageUnit.setStoredItemType(stack, stack.stackSize);
+                storageUnit.setStoredItemType(stack.copy(), stack.stackSize);
             } else {
                 storageUnit.setStoredItemCount(storageUnit.getStoredItemType().stackSize + stack.stackSize);
             }
@@ -76,7 +76,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
             IItemHandler handler = getItemHandler();
 
             if (handler != null) {
-                ItemHandlerHelper.insertItem(handler, stack, false);
+                ItemHandlerHelper.insertItem(handler, stack.copy(), false);
             }
         }
     }
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index c62802232..2e2b21202 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -402,7 +402,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
         ItemStack newStack = null;
 
         for (IStorage storage : storages) {
-            ItemStack took = storage.take(stack, requested - received, flags);
+            ItemStack took = storage.take(stack, requested, flags);
 
             if (took != null) {
                 if (newStack == null) {