Index: TECH/GlobalMultiDimIterator.cls.xml
===================================================================
diff -u -r3220 -r3221
--- TECH/GlobalMultiDimIterator.cls.xml	(.../GlobalMultiDimIterator.cls.xml)	(revision 3220)
+++ TECH/GlobalMultiDimIterator.cls.xml	(.../GlobalMultiDimIterator.cls.xml)	(revision 3221)
@@ -64,13 +64,15 @@
 </Method>
 
 <Method name="AtEnd">
-<FormalSpec>GlobalReference</FormalSpec>
+<FormalSpec>GlobalReference:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set AtEnd=0
-	Quit:GlobalReference="" 1
-	For I=0:1:..InitialGlobalReferenceSubscriptLength
-	{
-		Set:$QSubscript(GlobalReference,I)'=$QSubscript(..InitialGlobalReference,I) AtEnd=1
+	Quit:(GlobalReference = "") $$$True
+	
+	#dim AtEnd As %Boolean = 0
+	#dim I As %String = ""
+	For I = 1 : 1 :..InitialGlobalReferenceSubscriptLength {
+		Set:$$$Not($qsubscript(GlobalReference,I)=$qsubscript(..InitialGlobalReference,I)) AtEnd=1
 	}
 	Quit AtEnd
 ]]></Implementation>
Index: vhUnitTest/TECH/GlobalMultiDimIterator/Test.cls.xml
===================================================================
diff -u -r3134 -r3221
--- vhUnitTest/TECH/GlobalMultiDimIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 3134)
+++ vhUnitTest/TECH/GlobalMultiDimIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 3221)
@@ -125,6 +125,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Niet tot het einde lopen maar enkel tot">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,1)="SkippedNode"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(2,1)="Node2"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(3,1)="SkippedNode"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator(2)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Node2")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
 <Method name="DeleteData">
 <Private>1</Private>
 <Implementation><![CDATA[	kill @..#DataGlobal