Bug fix from previous commit
Merge pull request #401 from dbetebenner/master

Bug fix from previous commit