Fix for Teleporter