Issue #5262: Improved fix.
1 file changed