diff --git a/concord/builtins/key.lua b/concord/builtins/key.lua
index f083bd4..7e571ed 100644
--- a/concord/builtins/key.lua
+++ b/concord/builtins/key.lua
@@ -19,7 +19,7 @@ local Key = Component("key", function (self, key)
 end)
 
 function Key:deserialize (data)
-  self.value = getKey(self, data.value)
+  self.value = getKey(self, data)
 end
 
 function Key:removed (replaced)
@@ -28,10 +28,10 @@ function Key:removed (replaced)
 
     if entity:inWorld() then
       local world = entity:getWorld()
-  
+
       return world:__clearKey(entity)
     end
   end
 end
 
-return Key
\ No newline at end of file
+return Key
diff --git a/concord/world.lua b/concord/world.lua
index fc26e19..9303fe0 100644
--- a/concord/world.lua
+++ b/concord/world.lua
@@ -398,7 +398,8 @@ function World:deserialize(data, startClean, ignoreGenerator)
 
       if data[i].key then
          local component = Components.key:__new(entity)
-         entity.key = component:deserialize(data[i].key)
+         component:deserialize(data[i].key)
+         entity.key = component
 
          entity:__dirty()
       end