Fix #403
Merge pull request #408 from matthieuauger/fix-403

Fix #403