Fix #1150
Merge pull request #1151 from emmanuel-keller/1.5

Fix #1150