Fix for bug 990956