more work for bug 584733