Compatibility fix for 2.5.9