Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r3140 -r3142
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 3140)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 3142)
@@ -551,15 +551,18 @@
 <FormalSpec>Package:%String,IncludeSubPackages:%Boolean=0</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
+	#dim UsedPackage As %String = $$$If($$$Not(##class(TECH.StringUtils).EndsWith(Package,".")),Package_".",Package)
+	
 	set Classes = ##class(%ListOfDataTypes).%New()
-	#dim Query As TECH.String = "SELECT Name FROM %Dictionary.ClassDefinition WHERE Name %STARTSWITH ? ||'.' ORDER BY Name"
 	
-	#dim ResultSet As TECH.ResultSet = ##class(TECH.ResultSet).Create(Query,$listbuild(Package))
+	#dim Query As TECH.String = "SELECT Name FROM %Dictionary.ClassDefinition WHERE Name %STARTSWITH ? ORDER BY Name"
+	
+	#dim ResultSet As TECH.ResultSet = ##class(TECH.ResultSet).Create(Query,$listbuild(UsedPackage))
 	while ResultSet.Next() {
 		#dim ClassName As TECH.String = ResultSet.GetData(1)
 		if $$$Not(IncludeSubPackages) {
-			#dim Adder As %Boolean = $$$Not(##class(TECH.StringUtils).EndsWith(Package,"."))
-			if $length(ClassName,".")=($length(Package,".")+Adder) do Classes.Insert(ClassName)
+			#dim Adder As %Boolean = $$$Not(##class(TECH.StringUtils).EndsWith(UsedPackage,"."))
+			if $length(ClassName,".")=($length(UsedPackage,".")+Adder) do Classes.Insert(ClassName)
 		} else {
 			do Classes.Insert(ClassName)
 		}