Fix move bug