Small improvement of the teleport.