Fixes #689
Merge pull request #690 from jacquerie/master

Fixes #689