Fix #1498
Merge pull request #1499 from leigh123linux/master

 Fix #1498, closes #1498