Compatibility with v0.9.8.6