Fixes issue #811
Merge pull request #812 from wdwvt1/issue811

Fixes issue #811