Issue #572 fix
Merge pull request #574 from Stitchous/issue_572_fix

Issue #572 fix