Fix for bug 985496