cf: make compatible with 0.10.x