Fix #761
Merge pull request #762 from emmanuel-keller/1.5

Fix #761