Fix for #1555
Merge pull request #1556 from derekmcloughlin/issue-1555

Fix for #1555