Fix #245
Merge pull request #1146 from charlycoste/fix-245

Fix #245