diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
index d91440d93..0a0892a3b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
@@ -66,7 +66,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
 
         storage.writeToNBT();
 
-        stack.setTagCompound(debugDiskTag.copy());
+        stack.setTagCompound(debugDiskTag);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
index 6a119a3db..40edab7e0 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
@@ -194,7 +194,9 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
                 if (storage == null) {
                     itemHandler = null;
                 } else {
-                    cache.addListener(itemHandler = new ItemHandlerStorage(storage, cache));
+                    itemHandler = new ItemHandlerStorage(storage, cache);
+
+                    cache.addListener(itemHandler);
                 }
 
                 if (world != null) {