Fix weird movement, closes #1