Fix #1202
Merge pull request #1204 from emmanuel-keller/1.6

Fix #1202