Index: TECH/DynamicIterator.cls.xml
===================================================================
diff -u -r2679 -r2980
--- TECH/DynamicIterator.cls.xml	(.../DynamicIterator.cls.xml)	(revision 2679)
+++ TECH/DynamicIterator.cls.xml	(.../DynamicIterator.cls.xml)	(revision 2980)
@@ -18,7 +18,7 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Found">
+<Property name="HasNext">
 <Type>%Boolean</Type>
 <InitialExpression>0</InitialExpression>
 <Private>1</Private>
@@ -34,6 +34,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="WasNextCalled">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="WasHasNextCalled">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Iterator:TECH.Iterator,ItemStatement:%CacheString="",Filter:%CacheString=""</FormalSpec>
 <Private>1</Private>
@@ -44,26 +56,35 @@
 	set ..Iterator = Iterator
 	set ..ItemStatement = ItemStatement
 	set ..Filter = Filter
-	do ..GetNextItem()
 	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	do:$$$Not(..Found) ..ThrowNextFailedException()
-	#dim Value As %CacheString = ..Execute(..NextItem)
-	set ..NextItem = ""
+	do:($$$Not(..WasHasNextCalled) || (..WasNextCalled)) ..GetNextItem()
+	
+	do:$$$Not(..HasNext) ..ThrowNextFailedException()
+	
+	set ..WasHasNextCalled = $$$false
+	set ..WasNextCalled = $$$true
+	
 	set ..Key = ..Iterator.Key()
-	do ..GetNextItem()
+	#dim Value As %CacheString = ..Execute(..NextItem)
 	quit Value
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..Found
+<Implementation><![CDATA[
+	do:$$$Not(..WasHasNextCalled) ..GetNextItem()
+	
+	set ..WasHasNextCalled = $$$true
+	set ..WasNextCalled = $$$false
+	
+	quit ..HasNext
 ]]></Implementation>
 </Method>
 
@@ -78,12 +99,12 @@
 <Method name="GetNextItem">
 <Private>1</Private>
 <Implementation><![CDATA[
-	set ..Found = 0
-	while ('..Found) && (..Iterator.HasNext() ) {
+	set ..HasNext = 0
+	while ('..HasNext) && (..Iterator.HasNext() ) {
 		#dim IteratorItem As %CacheString = ..Iterator.Next()
-		set ..Found = ..IsValid(IteratorItem)
+		set ..HasNext = ..IsValid(IteratorItem)
 	}
-	set:..Found ..NextItem = IteratorItem
+	set:..HasNext ..NextItem = IteratorItem
 ]]></Implementation>
 </Method>