Workaround on #826.
Merge pull request #827 from emmanuel-keller/1.5

Workaround on #826.