fixes #614
Merge pull request #871 from roblarsen/2.0.8

fixes #614