Fixes #679
Merge pull request #687 from dgossow/fix-679

Fixes #679