some work for bug 29377