Fix #654
Merge pull request #675 from emmanuel-keller/1.5

Fix #674