support for 0.8.x