Another tweak for bug #6557.