(0.1r11) Compatibility fix for 1.7.2