A fix for bug #7631.