Better fix for custom teleports