Fixed teleportation issue