Fix #11
Merge pull request #1126 from charlycoste/fix-11

Fix #11