fix #217
fix #217
Merge pull request #254 from xiechao06/issue217

Issue217