Fixes #885
Merge pull request #889 from mdogan/fix/3.0/issue885

Fix/3.0/issue885