Crossover bug fix