Fix for bug 889978