more work for bug 843004