Fix #836
Merge pull request #838 from emmanuel-keller/1.6

Fix #836