Fix #7
Merge pull request #1122 from charlycoste/fix-7

Fix #7