Compatibility with 0.6devel