fix cherry-pick e089be30a804b1b58f6ad334dda3bb213ebe68a9