Fix #1202
Merge pull request #1203 from emmanuel-keller/1.5

Fix #1202