diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 78a9d3f..5bc4705 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -642,7 +642,7 @@
 
     assert !internal.verbose;
     internal.mainDexKeepRules = mainDexKeepRules;
-    internal.minimalMainDex = internal.debug;
+    internal.minimalMainDex = getMode() == CompilationMode.DEBUG;
     internal.mainDexListConsumer = mainDexListConsumer;
     internal.lineNumberOptimization =
         !internal.debug && (proguardConfiguration.isOptimizing() || internal.enableMinification)
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 752bd26..12e9b4a 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.3.30";
+  public static final String LABEL = "1.3.31";
 
   private Version() {
   }