Avoid teleportitis if the user does not want it

This refs #12.