Fix bug due to cherry-pick