Fixes #885
Merge pull request #926 from brycethomas/issue885

Fixes #885

Need to also update with #928