CRM-13311 additional fix