Fix for bug 821774