Fix #1254
Merge pull request #1268 from emmanuel-keller/master

Fix #1254