Merge pull request #38 from chengstory/#4528

fixes #4728
fixes #4528