Fixed comparisons in move method