merge Qianying's change