Fix #632
Merge pull request #633 from emmanuel-keller/1.5

Fix #632