Fix teleporting issue
Merge pull request #219 from lDiverse/patch-90

Fix teleporting issue