Fix movement canceling...