Fix #1229
Merge pull request #1232 from emmanuel-keller/master

Fix #1229