Fix #26
Merge pull request #1143 from charlycoste/fix-26

Fix #26