made a patch for bug 985425. updated the patch for bug 987784