Bug fix with latest merge
Merge pull request #368 from hoffmabc/master

Bug fix with latest merge