Fix #1102
Merge pull request #1145 from charlycoste/fix-1102

Fix #1102