fixes #4454
Merge pull request #26 from chengstory/#4454

fixes #4454