fixes #1608 - the perfect storm of circumstances bug
Merge pull request #1614 from evs-chris/gh-1608

Fix the perfect storm of circumstances bug - #1608