Fixes #1027
Merge pull request #1047 from tinwelint/1.9-fix-1027

Fixes #1027