patch for ticket 55f484c18c