Improve fix for issue #20300.
1 file changed