Fix #1229
Merge pull request #1230 from emmanuel-keller/1.5

Fix #1229