Fix #1194
Merge pull request #1196 from emmanuel-keller/1.5

Fix #1194