refact for opencomb 0.9.1