Fixes #2255
Merge pull request #2262 from pveentjer/fix/3.maintenance/2255

Fixes #2255