diff --git a/src/DCC.ts b/src/DCC.ts
index 726792d2b60aebf2694c35228e441aae5624b3c5..a4eeea7fc9e29fca8491ca1f6f3c978260feb223 100644
--- a/src/DCC.ts
+++ b/src/DCC.ts
@@ -1,5 +1,14 @@
 import * as si from "./DSI";
-import { XMLDate, XMLElement, XMLNumber, XMLBoolean, XMLList, INamespaced, ISchemaInformation, IAttributes } from "./BaseTypes";
+import {
+  XMLDate,
+  XMLElement,
+  XMLNumber,
+  XMLBoolean,
+  XMLList,
+  INamespaced,
+  ISchemaInformation,
+  IAttributes,
+} from "./BaseTypes";
 import { ensureArray } from "./Util";
 
 const schemaVersion = "3.1.2";
@@ -1152,11 +1161,6 @@ export class ListType extends DCCXMLElement {
 
     if (el.name) this.name = new TextType(el.name);
     if (el.description) this.description = new RichContentType(el.description);
-    if (el.usedMethods) this.usedMethods = new UsedMethodListType(el.usedMethods);
-    if (el.usedSoftware) this.usedSoftware = new SoftwareListType(el.usedSoftware);
-    if (el.measuringEquipments) this.measuringEquipments = new MeasuringEquipmentListType(el.measuringEquipments);
-    if (el.influenceConditions) this.influenceConditions = new InfluenceConditionListType(el.influenceConditions);
-    if (el.measurementMetaData) this.measurementMetaData = new MeasurementMetaDataListType(el.measurementMetaData);
 
     // choice
     if (el.dateTime) this.dateTime = new DCCXMLDate(el.dateTime);
@@ -1165,6 +1169,12 @@ export class ListType extends DCCXMLElement {
     // choice
     if (el.list) this.list = ensureArray(el.list).map((x) => new ListType(x));
     else if (el.quantity) this.quantity = ensureArray(el.quantity).map((x) => new QuantityType(x));
+
+    if (el.usedMethods) this.usedMethods = new UsedMethodListType(el.usedMethods);
+    if (el.usedSoftware) this.usedSoftware = new SoftwareListType(el.usedSoftware);
+    if (el.measuringEquipments) this.measuringEquipments = new MeasuringEquipmentListType(el.measuringEquipments);
+    if (el.influenceConditions) this.influenceConditions = new InfluenceConditionListType(el.influenceConditions);
+    if (el.measurementMetaData) this.measurementMetaData = new MeasurementMetaDataListType(el.measurementMetaData);
   }
 }