Fix oneClickMove bug