Patch for Ticket 2231