new patch for bug 602006