Fix #862
Merge pull request #863 from emmanuel-keller/1.5

Fix #862