New patch for bug 1043358