diff --git a/jode/jode/obfuscator/ClassIdentifier.java.in b/jode/jode/obfuscator/ClassIdentifier.java.in
index 2eeaf87..5943bcc 100644
--- a/jode/jode/obfuscator/ClassIdentifier.java.in
+++ b/jode/jode/obfuscator/ClassIdentifier.java.in
@@ -185,10 +185,12 @@ public class ClassIdentifier extends Identifier {
 		public int compare(Object o1, Object o2)  {
 		    Identifier i1 = (Identifier)o1;
 		    Identifier i2 = (Identifier)o2;
-		    boolean special1 = (i1.equals("<init>")
-					|| i1.equals("<clinit>"));
-		    boolean special2 = (i2.equals("<init>")
-					|| i2.equals("<clinit>"));
+		    String name1 = i1.getName();
+		    String name2 = i2.getName();
+		    boolean special1 = (name1.equals("<init>")
+					|| name1.equals("<clinit>"));
+		    boolean special2 = (name2.equals("<init>")
+					|| name2.equals("<clinit>"));
 		    // Put constructors at the beginning
 		    if (special1 != special2) {
 			return special1 ? -1 : 1;
diff --git a/jode/jode/obfuscator/Makefile.am b/jode/jode/obfuscator/Makefile.am
index 92004fd..774aa5e 100644
--- a/jode/jode/obfuscator/Makefile.am
+++ b/jode/jode/obfuscator/Makefile.am
@@ -3,7 +3,8 @@
 JAR = @JAR@
 JAVAC = @JAVAC@
 JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
+   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) \
+   -depfile=Makefile.dep
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
 SUBSTCP = @SUBSTCP@
@@ -42,13 +43,13 @@ MY_JAVA_FILES = \
 noinst_DATA = $(MY_JAVA_FILES:.java=.class)
 EXTRA_DIST = $(MY_JAVA_FILES)
 
-@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
+@QUOTE@-include Makefile.dep
 
 %.class: %.java
 	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
 
-%.dep: %.class
-	$(JAVADEP) $< >$@
+Makefile.dep: $(MY_JAVA_FILES:.java=.class)
+	$(JAVADEP) $^
 
 clean-local:
 	@rm -f *.class