Issue 578 fix
Merge pull request #579 from Stitchous/Issue-578-fix

Issue #578 fix