Fixed #1086
Merge pull request #1088 from fruitwasp/master

Fixed #1086