Fix issue #261.
Merge pull request #272 from emmanuel-keller/1.5

Fix issue #261.