Handle weird variable crossover bug