Compatibility fix for 2.0