some more work for bug 1591