Applied patch for bug #2814