more work for bug 877262