bug fix #68. Refactor for LiuFeng