Fix/crm 1930