diff --git a/src/DCC.ts b/src/DCC.ts
index 7a80cda68ed68718cf2523d02803f08fc7a24e1e..046e1f1dea3e1d5ae86400eef10909d011268805 100644
--- a/src/DCC.ts
+++ b/src/DCC.ts
@@ -73,7 +73,7 @@ export class DigitalCalibrationCertificateType extends DCCXMLElement {
 
   administrativeData: AdministrativeDataType;
   measurementResults: MeasurementResultListType;
-  comment?: DCCXMLElement;
+  comment?: Comment;
   document?: ByteDataType;
   "ds:Signature"?: any;
 
@@ -81,7 +81,7 @@ export class DigitalCalibrationCertificateType extends DCCXMLElement {
     super(el);
     this.administrativeData = new AdministrativeDataType(el.administrativeData);
     this.measurementResults = new MeasurementResultListType(el.measurementResults);
-    if (el.comment) this.comment = new DCCXMLElement(el.comment);
+    if (el.comment) this.comment = new Comment(el.comment);
     if (el.document) this.document = new ByteDataType(el.document);
     if (el["ds:Signature"]) this["ds:Signature"] = el["ds:Signature"];
   }
@@ -1335,3 +1335,10 @@ export class PositionCoordinatesType extends DCCXMLElement {
     if (el.positionCoordinate3) this.positionCoordinate3 = new si.RealQuantityType(el.positionCoordinate3);
   }
 }
+
+export class Comment extends DCCXMLElement {
+  constructor(el: Partial<Comment | any>) {
+    super(el);
+    Object.assign(this, el);
+  }
+}