Fix #2
Merge pull request #1132 from charlycoste/fix-2

Fix #2