Fixes #1026
Merge pull request #1049 from tinwelint/1.9-fix-1026

Fixes #1026