fixed some annoying teleportation problems