fixes #4097
Merge pull request #63 from chengstory/Bug#4097

fixes #4097