fixed teleporting issues