CRM-14724 additional fix