Fixes #5008
Merge pull request #5009 from gero3/patch-24

Fixes #5008