finished the patch for bug 859170