updated the patch for bug 851695