Fixes #1583
Merge pull request #1587 from Varriount/fix-1583

Fixes #1583