Fix bug due to poor cherry picking