Index: DOM/VKP/impl/DataM/DataMKlantNative.cls.xml
===================================================================
diff -u -r29059 -r32379
--- DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 29059)
+++ DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 32379)
@@ -949,12 +949,18 @@
 	If (..GeefLeverAdressen().Size) {
 			set LeverAdres = ..GeefLeverAdressen().GetAt(1)
 		} else {
-			set LeverAdres = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(..GeefID()).GeefAdres()
+			set LeverAdres = ..GeefAdres()
 		}
 	quit LeverAdres
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAdres">
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(..GeefID()).GeefAdres()
+]]></Implementation>
+</Method>
+
 <Method name="ZetPrijsCodexStandaard">
 <FormalSpec>PrijsCodex:DOM.VKP.enu.PrijsCodex</FormalSpec>
 <Implementation><![CDATA[	do ..Node2.ZetPiece(3,PrijsCodex)