Fix for Bug 7671