Fix crossover bug