Fix #832
Merge pull request #833 from emmanuel-keller/1.5

Fix #832