Final fix #1243
Merge pull request #1246 from emmanuel-keller/1.5

Final fix #1243