Fix #1217
Merge pull request #1219 from emmanuel-keller/1.5

Fix #1217