Fix cherry-pick issue