Fix #17
Merge pull request #1137 from charlycoste/fix-17

Fix #17