Fix #13
Merge pull request #1123 from charlycoste/fix-13

Fix #13