fix #155
fix #160
trivial
Merge pull request #162 from xiechao06/issue160

fix #160