diff --git a/storage/chest.lua b/storage/chest.lua
index 20db286..c3c6c1b 100644
--- a/storage/chest.lua
+++ b/storage/chest.lua
@@ -1,6 +1,7 @@
 local ItemStack = require("storage.itemstack")
 
 local Chest = {}
+Chest.__index = Chest
 
 -- Homogeneity allows chest scan to clone empty itemDetail slot to all empty slots in chest
 function Chest:fromPeripheral(name, homogeneous)
diff --git a/storage/init.lua b/storage/init.lua
index aaf99b7..1003eb7 100644
--- a/storage/init.lua
+++ b/storage/init.lua
@@ -1,5 +1,6 @@
 local Chest = require("storage.chest")
 local Storage = {}
+Storage.__index = Storage
 
 function Storage.assumeHomogeneous(names)
   local mappings = {}
@@ -45,7 +46,7 @@ function Storage:fromSerializable(ser)
   end
   
   setmetatable(obj, self)
-  obj.__index = obj
+  obj.__index = self
 
   return obj
 end
diff --git a/storage/itemstack.lua b/storage/itemstack.lua
index e2476cd..2c3b9b1 100644
--- a/storage/itemstack.lua
+++ b/storage/itemstack.lua
@@ -1,4 +1,5 @@
 local ItemStack = {}
+ItemStack.__index = ItemStack
 
 function ItemStack:fromDetail(inv, detail, slot)
     local obj = {