Fix onClaimSaved