Get teleporting working as it used to