1. fixes #4530
11
Merge pull request #42 from chengstory/#4530

#4530