Fixes #11245

Fixes #11245