Fix #241
Merge pull request #1115 from charlycoste/fix-241

Fix #241