Fix #1094
Merge pull request #1116 from charlycoste/fix-1094

Fix #1094