1 files changed, 3 insertions, 16 deletions
diff --git a/crypto/src/asn1/x509/V2Form.cs b/crypto/src/asn1/x509/V2Form.cs
index 2c6e54a77..53475ffbe 100644
--- a/crypto/src/asn1/x509/V2Form.cs
+++ b/crypto/src/asn1/x509/V2Form.cs
@@ -115,22 +115,9 @@ namespace Org.BouncyCastle.Asn1.X509
         public override Asn1Object ToAsn1Object()
         {
             Asn1EncodableVector v = new Asn1EncodableVector();
-
-            if (issuerName != null)
-            {
-                v.Add(issuerName);
-            }
-
-            if (baseCertificateID != null)
-            {
-                v.Add(new DerTaggedObject(false, 0, baseCertificateID));
-            }
-
-            if (objectDigestInfo != null)
-            {
-                v.Add(new DerTaggedObject(false, 1, objectDigestInfo));
-            }
-
+            v.AddOptional(issuerName);
+            v.AddOptionalTagged(false, 0, baseCertificateID);
+            v.AddOptionalTagged(false, 1, objectDigestInfo);
             return new DerSequence(v);
         }
     }