Fix #8
Merge pull request #1120 from charlycoste/fix-8

Fix #8