Crm 13972 fix