Yet another fix for bug #7297.