Fix for compilation problem after variable rename