#CRM-6 fixed