bug fix
Merge pull request #1296 from scottpurdy/hotfix

bug fix