Fix #164
Merge pull request #219 from rlouapre/issue-164

Fix #164