new patch for bug 628458