Fix for bug #8875.