Fix IDWithIssuer match condition