Hopefully fixed teleporting for good