proposed patch for CRM-13440