made work with 0.8.x