Another slight fix for bug #8030.