Fix #761
Merge pull request #763 from emmanuel-keller/1.6

Fix #761