Fix for bug 7671