fixed issue #435
Merge pull request #472 from dreame4/issue-435

fixed issue #435