updates for bug 989043