fix for bug 896360