Fix for custom teleports