Allow compatibility with 0.6.4