partial fix CRM-12065