fix cherry-pick issue