diff --git a/storage/chest.lua b/storage/chest.lua
index cc2836d..a67fe24 100644
--- a/storage/chest.lua
+++ b/storage/chest.lua
@@ -4,14 +4,17 @@ 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)
-    local chest = peripheral.wrap(name)
+function Chest:fromPeripheral(chest, homogeneous)
+    if type(chest) == "string" then
+        chest = peripheral.wrap(chest)
+    end
+    
     if chest == nil then
         return nil
     end
 
     local obj = {
-        name = name,
+        name = peripheral.getName(chest),
         chest = chest,
         size = chest.size(),
         homogeneous = homogeneous