Fixes #695
Merge pull request #700 from jacquerie/issue-695

Fixes #695