Improved teleporting on surface of water.