Fix #632
Merge pull request #634 from emmanuel-keller/1.6

Fix #632