revert the change of zhangwu which will cause infinity loop