diff --git a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
index b8870ae0..e5330e1d 100644
--- a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import org.jf.baksmali.baksmali;
 import org.jf.baksmali.main;
+import org.jf.dexlib.Code.Analysis.ClassPath;
 import org.jf.dexlib.DexFile;
 
 /**
@@ -40,11 +41,14 @@ public class SmaliDecoder {
     }
 
     private void decode() throws AndrolibException {
+        if (mDebug) {	
+            ClassPath.dontLoadClassPath = true;
+        }
         try {
             baksmali.disassembleDexFile(mApkFile.getAbsolutePath(),
                 new DexFile(mApkFile), false, mOutDir.getAbsolutePath(), null,
                 null, null, false, true, true, true, false, false, 
-                mDebug ? main.FULLMERGE : 0, false, mDebug ? true : false, null);
+                mDebug ? main.DIFFPRE: 0, false, false, null);
         } catch (IOException ex) {
             throw new AndrolibException(ex);
         }