Fixes #1529
Merge pull request #1549 from Varriount/fix-1529

Fixes #1529