Fix for bug 989650