Fixes #11245