fix v2.0 build-322