fix a bug of JieWei(last 7 commits by Para)