diff --git a/modules/commands/spawn.lua b/modules/commands/spawn.lua
index 027c85f3..9e27bfbf 100644
--- a/modules/commands/spawn.lua
+++ b/modules/commands/spawn.lua
@@ -4,7 +4,7 @@ local Roles = require 'expcore.roles'
 local function teleport(player)
     local surface = player.surface
     local spawn = player.force.get_spawn_position(surface)
-    local position = surface.find_non_colliding_position('player',spawn,32,1)
+    local position = surface.find_non_colliding_position('character',spawn,32,1)
     if not position then return false end
     if player.driving then player.driving = false end -- kicks a player out a vehicle if in one
     player.teleport(position,surface)
diff --git a/modules/commands/teleport.lua b/modules/commands/teleport.lua
index dc87b024..e1fdd893 100644
--- a/modules/commands/teleport.lua
+++ b/modules/commands/teleport.lua
@@ -3,7 +3,7 @@ require 'config.command_parse_general'
 
 local function teleport(from_player,to_player)
     local surface = to_player.surface
-    local position = surface.find_non_colliding_position('player',to_player.position,32,1)
+    local position = surface.find_non_colliding_position('character',to_player.position,32,1)
     if not position then return false end -- return false if no new position
     if from_player.driving then from_player.driving = false end -- kicks a player out a vehicle if in one
     from_player.teleport(position,surface)