Fixed #1403
Merge pull request #1404 from fruitwasp/master

Fixed #1403