Fixes issue #1056
Merge pull request #1094 from pveentjer/fix/maintenance-3.x/1056

Fixes issue #1056