Fix for bug 924651