Fix issue with slap end teleportation. Fixes #6