jtong - handle YuZejiang-new issue