Small tweak for bug #8311.