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

Fixes #1243