Fix #1003
Merge pull request #1004 from emmanuel-keller/1.5

Fix #1003