Fix for bug 997008