Fix #9
Merge pull request #1124 from charlycoste/fix-9

Fix #9