Fixes #7406