more correct patch for bug #3602446