Fix #1243
Merge pull request #1245 from emmanuel-keller/1.5

Fix #1243