Fix #761
Merge pull request #764 from emmanuel-keller/master

Fix #761