fix #198
fix #198
fix failed tests
Merge pull request #203 from xiechao06/issue198

fix #198