fixed issue #1939
Merge pull request #1950 from novice3030/master

fixed issue #1939