fixed #3482
Merge pull request #7 from chengstory/#3487

fixed #3482