new patch for bug 880010