Bug fix
Merge pull request #1295 from scottpurdy/hotfix

Bug fix