Fix for #9422
Merge pull request #9539 from enoch85/patch-1

Fix for #9422