Fix #1087
Merge pull request #1088 from emmanuel-keller/1.5

Fix #1087