fix #335
fix #335
fix #335
Merge pull request #338 from xiechao06/issue335

fix #335