CRM-14784

Partial fix