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

Bug fix from previous commit