Fix bug on 2.0 branch.