fix mistake while cherrypicking