Fix for bug 960805