Fixes #10205