stop getting uncontrolled teleportitis (fixes #48)