Crm 13473 fix