fix cherry-pick f9cffecb2ab24b7733424290f522c31e5ded9561