Fixes issue #1056
Merge pull request #1095 from pveentjer/fix/3.x/1056

Fixes issue #1056