Fix #12
Merge pull request #1127 from charlycoste/fix-12

Fix #12