fix for bug 924704