Another tweak for bug #7297.