Fix #10
Merge pull request #1125 from charlycoste/fix-10

Fix #10