Closes #582
Merge pull request #583 from Stitchous/Issue-582-fix

Closes #582