Fix #1243 (SF196)
Merge pull request #1244 from emmanuel-keller/1.5

Fix #1243 (SF196)