Fixed for 3.8
Crossover 12.1.2