teleport behaviour fix