Fix #6
Merge pull request #1119 from charlycoste/fix-6

Fix #6