fixes #4528
Merge pull request #39 from chengstory/#4528

fixes #4528