Attempt a fix for #837
Merge pull request #875 from bhollis/837

Attempt a fix for #837