CRM-13647 fix