fixing cherry-pick error