Fixes #3935 Thanks for the patch!