Possibly fix teleportation