continue the v0.19 adaptation