Fix claim computing in Production CRA