fixes #4574
Merge pull request #4578 from houbaastef/master

fixes #4574