diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
index 4ff72749c..1dd1bcf59 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
@@ -151,12 +151,12 @@ public class ClassPathLoader {
 			long t0 = System.currentTimeMillis();
 			ClassFile[] classes = loader.getClasses();
 			long dt = System.currentTimeMillis() - t0;
-			System.out.println("" + classes.length + " loaded in " + dt + "ms");
+			System.out.println("" + classes.length + " classes loaded in " + dt + "ms");
 			for (int j = 0; j < classes.length; j++){
-				String name = classes[j].getName();
+				String name = classes[j].getFullName();
 				// do not allow duplicates entries to preserve 'classpath' behavior
 				// first class in wins
-				if ( !map.contains(name) ){
+				if ( !map.containsKey(name) ){
 					map.put(name, classes[j]);
 				}
 			}
@@ -164,13 +164,6 @@ public class ClassPathLoader {
 		return map;
 	}
 	
-	/** dirty little test, should be moved to a testcase */
-	public static void main(String[] args) throws Exception {
-		ClassPathLoader cl = new ClassPathLoader("e:/jdk/jdk1.3.1/lib/tools.jar;e:/jdk/jdk1.3.1/jre/lib/rt.jar");
-		Hashtable map = cl.getClasses();
-		System.out.println("Loaded classes: " + map.size());
-	}
-	
 	/** the loader enumeration that will return loaders */
 	protected class LoaderEnumeration implements Enumeration {
 		protected int index = 0;