CRM-15364 additional fix