fix 06c055dd75f, it is 2.2's change