Fix issue with layers during crossover