Fixed #1131
Merge pull request #1132 from fruitwasp/master

Fixed #1131