diff --git a/EA-ModelKit/Model/Export/ExportableElement.cs b/EA-ModelKit/Model/Export/ExportableElement.cs
index 36a705d..2ac9aef 100644
--- a/EA-ModelKit/Model/Export/ExportableElement.cs
+++ b/EA-ModelKit/Model/Export/ExportableElement.cs
@@ -48,9 +48,12 @@ public ExportableElement(SlimElement element, IReadOnlyList<string> taggedValues
             this.KindName = element.ElementKind;
             this.Headers = [..this.baseHeaders, ..taggedValuesToExport];
 
-            this.ExportableValues[this.baseHeaders[0]] = element.Name;
-            this.ExportableValues[this.baseHeaders[1]] = element.Alias;
-            this.ExportableValues[this.baseHeaders[2]] = WebUtility.HtmlDecode(element.Notes);
+            var values = new List<string> {element.Name, element.Alias,WebUtility.HtmlDecode(element.Notes)};
+
+            for(var baseHeaderIndex = 0;baseHeaderIndex < this.baseHeaders.Length;baseHeaderIndex++)
+            {
+                this.ExportableValues[this.baseHeaders[baseHeaderIndex]] = values[baseHeaderIndex];
+            }
 
             foreach (var taggedValueToExport in taggedValuesToExport)
             {