fix from cherry-pick