Fixes #3783 Thanks for the report & patch help