Patch for ticket 2560.