Fix move checking