Index: DOM/VKP/impl/DataM/DataMKlantNative.cls.xml
===================================================================
diff -u -r47740 -r48212
--- DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 47740)
+++ DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 48212)
@@ -398,9 +398,19 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.common.Adres"</ReturnTypeParams>
 <Implementation><![CDATA[
-	Set Adressen = ##class(%ListOfObjects).%New()
-	;Do Adressen.Insert(..GeefAdres())
-	Do ##class(TECH.ListUtils).CopyListOfObjects(..GeefAdressenVolgensType(""),Adressen)
+	#Dim Adressen As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#Dim LijnNr As %Integer = 1
+	#Dim Node As %String = "L" _ $$$LeftPadding(LijnNr, 3, " ")
+	#Dim IndexKKL As %String = ..GeefKlantIndexKKL()
+	#Dim AdresKey As %String = "L"
+	
+	Set AdresKey = $Order(^KKL(IndexKKL, AdresKey))
+	
+	While ($Extract(AdresKey) = "L") {
+		#Dim AdresGegevens As %String = ^KKL(..GeefKlantIndexKKL(), AdresKey)	
+		Do Adressen.Insert(..GeefSpecifiekAdres(AdresKey))
+		Set AdresKey = $Order(^KKL(IndexKKL, AdresKey))
+	}
 	Quit Adressen
 ]]></Implementation>
 </Method>