Fixes #9415
Merge pull request #9418 from BBosman/fix-9415

Fixes #9415