Bug 5202: more work