Fix for bug 988733