Fixed issue #1158
Merge pull request #1160 from ne0fhyk/fix_issue_1158

Fixed issue #1158