Fix move validation