Fix #1229
Merge pull request #1231 from emmanuel-keller/1.6

Fix #1229