Fix bug where moving from origin fails