CRM-11789 further fix