Compilation fix for EPR 394905