Safely extend Teleport (2 tests failing.)