some work for bug 1591