fixup issue 593
fixup 593 revised
Merge pull request #608 from tim-caper/issue593

fixup issue 593