@Foz: It's got to be an addition because not all units have the same Armour value at a given Armour level in vanilla, so if it was fixed you'd get the same issue you describe possibly happening with the shield fix.