Index: TECH/KeyValue/List.cls.xml
===================================================================
diff -u -r2583 -r3586
--- TECH/KeyValue/List.cls.xml	(.../List.cls.xml)	(revision 2583)
+++ TECH/KeyValue/List.cls.xml	(.../List.cls.xml)	(revision 3586)
@@ -44,10 +44,11 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Gevonden As %Boolean = $$$False
-	
-	#dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..GetValuesForKey(Key))
+
+	Set ListIterator = ##class(TECH.ListIterator).%New($this)
 	While (ListIterator.HasNext()) && $$$Not(Gevonden) {
-		Set Gevonden = (ListIterator.Next() = Value )
+		#dim KeyValuePair As TECH.KeyValuePair = ListIterator.Next()
+		Set Gevonden = (KeyValuePair.Key = Key) && (KeyValuePair.Value = Value)
 	}
 	
 	Quit Gevonden