Refactor - fix bug teleport.