Index: DOM/VKP/impl/DataM/DataMOrderIDIterator.cls.xml
===================================================================
diff -u -r29059 -r44045
--- DOM/VKP/impl/DataM/DataMOrderIDIterator.cls.xml	(.../DataMOrderIDIterator.cls.xml)	(revision 29059)
+++ DOM/VKP/impl/DataM/DataMOrderIDIterator.cls.xml	(.../DataMOrderIDIterator.cls.xml)	(revision 44045)
@@ -6,6 +6,11 @@
 <Super>%RegisteredObject,TECH.Iterator</Super>
 <Inheritance>right</Inheritance>
 
+<Property name="HuidigOrderID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VolgendeOrderID">
 <Type>%String</Type>
 <Private>1</Private>
@@ -16,6 +21,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set ..HuidigOrderID = ""
 	Set ..VolgendeOrderID = ""
 	Do ..BepaalVolgende()
 	Quit $$$OK
@@ -31,12 +37,18 @@
 <Method name="Next">
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim HuidigOrderID As %String = ..VolgendeOrderID
+	Set ..HuidigOrderID = ..VolgendeOrderID
 	Do ..BepaalVolgende()
-	Quit HuidigOrderID
+	Quit ..HuidigOrderID
 ]]></Implementation>
 </Method>
 
+<Method name="Key">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ..HuidigOrderID
+]]></Implementation>
+</Method>
+
 <Method name="BepaalVolgende">
 <Private>1</Private>
 <Implementation><![CDATA[