Fix for bug 991398