Fix issue #1843 (teleport case)
Revert @24efb9b4