Fixed move cancellation (completely) :smile_cat: :smiling_imp: