Possible fix for #838
Merge pull request #841 from sjinks/issue-838

Possible fix for #838