Fix issue #293
Merge pull request #294 from emmanuel-keller/1.5

Fix issue #293