fix for bug #8333