Improved compatibility with 0.8 branch