fix for cherry-pick commit