Fix #1243 (SF196)
Fix #1243
Final fix #1243
Merge pull request #1248 from emmanuel-keller/master

Fixed #1243