Fix #85

Teleports should no longer misbehave. A little more testing will still
need to be done to ensure this.