Patch for ticket #19672