Fix #836
Merge pull request #839 from emmanuel-keller/master

Fix #836