Bug fix movement stop