Fix #654
Merge pull request #676 from emmanuel-keller/1.6

Fix #674