more work on bug 843004