Fixes #1034
Merge pull request #1050 from tinwelint/1.9-fix-1034

Fixes #1034