Fix #904
Merge pull request #928 from emmanuel-keller/1.5

Fix #904