Fix #737
Merge pull request #770 from emmanuel-keller/master

Fix #737