Correctly take into account discarded fields when calculating the IRI