fix ticket 574
Merge pull request #27 from xiechao06/ticket574

fix ticket 574