CRM-13811: full fix