Fix for Issue #586
Merge pull request #587 from alicegoldfuss/issue_586

Fix for Issue #586