diff --git a/modules/WarpPoints/control.lua b/modules/WarpPoints/control.lua
index eed4a68a..843d9f63 100644
--- a/modules/WarpPoints/control.lua
+++ b/modules/WarpPoints/control.lua
@@ -240,7 +240,7 @@ script.on_event(defines.events.on_player_created, function(event)
             text='Warp: Spawn',
             icon={type='item',name=warp_item}
         })
-        global.warps['Spawn'] = {tag=tag,surface=player.surface,position={0,0}}
+        global.warps['Spawn'] = {tag=tag,surface=player.surface.index,position={0,0}}
     end
 end)