fixes #4422
Merge pull request #11 from chengstory/#4422

fixes #4422