Fix teleporting issue