Crm 15619 fix