adapt to ccw 0.31.0