A fix for bug #7297.