Index: TECH/Files.cls.xml
===================================================================
diff -u -r3385 -r3417
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 3385)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 3417)
@@ -68,16 +68,19 @@
 	do rset.Execute(Directory,FileMask,"",1)
 	#dim ContinueLoop as %Boolean = $$$True
 	while (rset.Next() & ContinueLoop) { 
-          Set FullName = ..AppendFile(Directory,rset.Data("ItemName"))
-          if (rset.Data("Type") = "D") { 
-          	set SubDirectory = FullName
-	        if AddSubDir Do ..GetFileList(SubDirectory,FileMask,AddSubDir,IncludeDirs)
-	        if IncludeDirs Do ..AddToList(Directory,rset)
-          }
-          else {
-	        Do ..AddToList(FullName,rset)   
-	        Set:NumberOfFiles ContinueLoop = (..List.Count() < NumberOfFiles)
-          }
+		if (..List.Count() < NumberOfFiles) || (NumberOfFiles = 0 ) {
+			Set FullName = ..AppendFile(Directory,rset.Data("ItemName"))
+          	if (rset.Data("Type") = "D") { 
+          		set SubDirectory = FullName
+	        	if AddSubDir Do ..GetFileList(SubDirectory,FileMask,AddSubDir,IncludeDirs,NumberOfFiles)
+	        	if IncludeDirs Do ..AddToList(Directory,rset)
+          	} else {
+	        	Do ..AddToList(FullName,rset)   
+          	}
+	        if (NumberOfFiles > 0) {
+		        Set ContinueLoop = (..List.Count() < NumberOfFiles)
+	        }
+         }
 	}
 	quit ..List
 ]]></Implementation>