Fixed for move selection