diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5b4cd4a1..753890448 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.9.6
+- Fixed Portable Grid losing enchantments when placing and breaking (raoulvdberge)
+
 ### 1.9.5
 - Re-added the `/refinedstorage disk create <player> <id>` command (raoulvdberge)
 - Added the `/refinedstorage disk list` command (raoulvdberge)
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
index f299fc113..84200fa65 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
@@ -146,17 +146,14 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
         }
     }
 
-    // @Volatile: From BlockDispenser#getDispensePosition
     private double getDispensePositionX() {
         return (double) pos.getX() + 0.5D + 0.8D * (double) getDirection().getXOffset();
     }
 
-    // @Volatile: From BlockDispenser#getDispensePosition
     private double getDispensePositionY() {
         return (double) pos.getY() + (getDirection() == Direction.DOWN ? 0.45D : 0.5D) + 0.8D * (double) getDirection().getYOffset();
     }
 
-    // @Volatile: From BlockDispenser#getDispensePosition
     private double getDispensePositionZ() {
         return (double) pos.getZ() + 0.5D + 0.8D * (double) getDirection().getZOffset();
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
index 6370ad62e..a25c76e5c 100644
--- a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
+++ b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
@@ -162,7 +162,6 @@ public abstract class BaseContainer extends Container {
 
     private boolean isTileStillThere() {
         if (tile != null) {
-            // @Volatile: Logic from LockableLootTileEntity#isUsableByPlayer
             return tile.getWorld().getTileEntity(tile.getPos()) == tile;
         }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java
index a85e623b0..99d9950c6 100644
--- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java
+++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java
@@ -53,8 +53,9 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe {
             for (int i = 0; i < enchantments.size(); ++i) {
                 CompoundNBT enchantmentNbt = enchantments.getCompound(i);
 
-                // @Volatile: NBT tags from ItemEnchantedBook
-                if (ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(enchantmentNbt.getString("id"))) == enchant.enchantment && enchantmentNbt.getShort("lvl") == enchant.enchantmentLevel) {
+                // @Volatile: NBT tags from EnchantedBookItem
+                if (ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(enchantmentNbt.getString("id"))) == enchant.enchantment &&
+                    enchantmentNbt.getShort("lvl") == enchant.enchantmentLevel) {
                     return true;
                 }
             }
diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
index 51ffa46a8..bce66d599 100644
--- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
+++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
@@ -117,7 +117,8 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid,
     private static final String NBT_FLUID_STORAGE_TRACKER = "FluidStorageTracker";
     private static final String NBT_TYPE = "Type";
     private static final String NBT_ENERGY = "Energy";
-    private static final String NBT_ENCHANTMENTS = "ench"; // @Volatile: minecraft specific nbt key
+    private static final String NBT_ENCHANTMENTS = "Enchantments"; // @Volatile: Minecraft specific nbt key, see EnchantmentHelper
+
     private EnergyStorage energyStorage = createEnergyStorage(0);
     private final LazyOptional<EnergyStorage> energyStorageCap = LazyOptional.of(() -> energyStorage);