Fix #19
Merge pull request #1140 from charlycoste/fix-19

Fix #19