Fixed teleport issue