fix cherry-pick 3513f9830a38fd8704256a83216cb7c4f36f6982