1 files changed, 2 insertions, 11 deletions
diff --git a/crypto/src/asn1/crmf/OptionalValidity.cs b/crypto/src/asn1/crmf/OptionalValidity.cs
index 46fd1f860..d608ea5d1 100644
--- a/crypto/src/asn1/crmf/OptionalValidity.cs
+++ b/crypto/src/asn1/crmf/OptionalValidity.cs
@@ -60,17 +60,8 @@ namespace Org.BouncyCastle.Asn1.Crmf
         public override Asn1Object ToAsn1Object()
         {
             Asn1EncodableVector v = new Asn1EncodableVector();
-
-            if (notBefore != null)
-            {
-                v.Add(new DerTaggedObject(true, 0, notBefore));
-            }
-
-            if (notAfter != null)
-            {
-                v.Add(new DerTaggedObject(true, 1, notAfter));
-            }
-
+            v.AddOptionalTagged(true, 0, notBefore);
+            v.AddOptionalTagged(true, 1, notAfter);
             return new DerSequence(v);
         }
     }