fixes #694
Merge pull request #695 from weekeight/issue_694

fixes #694