Compatibility with v2.0b7