Index: ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml
===================================================================
diff -u -r39358 -r39359
--- ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39358)
+++ ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39359)
@@ -239,15 +239,13 @@
 <Implementation><![CDATA[
 	Set KenmerkenArray = ##class(%ArrayOfDataTypes).%New()
 	Set PropertyIterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties("ECON.PM.Maatwerk.dto.TbxKenmerken"))
-	#dim ElementTeller As %Integer = 1
 	While PropertyIterator.HasNext() {
 		#dim PropertyName As %String = PropertyIterator.Next()
 		#dim Value As %String = $property($this,PropertyName)
 		continue:PropertyName="NietMeeleveren"
 		If $length(Value) {
 			Set CompiledProperty = ##class(%Dictionary.CompiledProperty).%OpenId("ECON.PM.Maatwerk.dto.TbxKenmerken||"_PropertyName)
-			Do KenmerkenArray.SetAt(CompiledProperty.Parameters.GetAt("XMLNAME")_"="_Value ,ElementTeller)
-			Set ElementTeller = ElementTeller + 1
+			Do KenmerkenArray.SetAt(Value,CompiledProperty.Parameters.GetAt("XMLNAME"))
 		}
 	}
 	Quit KenmerkenArray
Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml
===================================================================
diff -u -r39351 -r39359
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39351)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39359)
@@ -9,7 +9,7 @@
 	Set Object.Toepassing = "Lade"
 
 	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	Do $$$AssertEquals(Array.GetAt(1),"Toepassing=Lade")
+	Do $$$AssertEquals(Array.GetAt("Toepassing"),"Lade")
 ]]></Implementation>
 </Method>
 
@@ -19,7 +19,7 @@
 	Set Object.CorpusWandDikte = 18
 
 	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	do $$$AssertEquals(Array.GetAt(1),"Corpuswanddikte=18")
+	do $$$AssertEquals(Array.GetAt("Corpuswanddikte"),"18")
 ]]></Implementation>
 </Method>
 
@@ -30,8 +30,8 @@
 	Set Object.CorpusWandDikte = 18
 
 	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	Do $$$AssertEquals(Array.GetAt(1),"Corpuswanddikte=18")
-	Do $$$AssertEquals(Array.GetAt(2),"Toepassing=Lade")
+	Do $$$AssertEquals(Array.GetAt("Corpuswanddikte"),"18")
+	Do $$$AssertEquals(Array.GetAt("Toepassing"),"Lade")
 ]]></Implementation>
 </Method>
 </Class>