updating on bug 20087