more work for bug 843004 part2 patch