Fix #632
Merge pull request #635 from emmanuel-keller/master

Fix #632