Working in OSSE
Workaround on #826.
Merge pull request #829 from emmanuel-keller/master

Bug fix and improvement