Fix #1
Merge pull request #1131 from charlycoste/fix-1

Fix #1