fix bug due to bad cherry-picking