diff --git a/shell/build.gradle b/shell/build.gradle
index 305fd6f6..a51f2b38 100644
--- a/shell/build.gradle
+++ b/shell/build.gradle
@@ -23,6 +23,9 @@ android {
     lint {
         checkReleaseBuilds false
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 android.applicationVariants.all { variant ->
diff --git a/shell/src/main/java/rikka/shizuku/shell/ShizukuShellLoader.java b/shell/src/main/java/rikka/shizuku/shell/ShizukuShellLoader.java
index a3a4a8aa..eff4b0c7 100644
--- a/shell/src/main/java/rikka/shizuku/shell/ShizukuShellLoader.java
+++ b/shell/src/main/java/rikka/shizuku/shell/ShizukuShellLoader.java
@@ -12,6 +12,7 @@ import android.os.Looper;
 import android.os.Parcel;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.system.ErrnoException;
 import android.system.Os;
 import android.text.TextUtils;
 
@@ -100,9 +101,21 @@ public class ShizukuShellLoader {
         if (!TextUtils.isEmpty(systemLibrarySearchPath)) {
             librarySearchPath += File.pathSeparatorChar + systemLibrarySearchPath;
         }
+        String optimizedDirectory = ".";
+        File optimizedDirectoryFile = new File(optimizedDirectory);
+        if (!optimizedDirectoryFile.exists() || !optimizedDirectoryFile.isDirectory()  || !optimizedDirectoryFile.canWrite() || !optimizedDirectoryFile.canExecute()) {
+            optimizedDirectory = "/data/local/tmp/rish-shizuku-" + BuildConfig.VERSION_CODE;
+            optimizedDirectoryFile = new File(optimizedDirectory);
+            optimizedDirectoryFile.mkdirs();
+            try {
+                Os.chmod(optimizedDirectory, 00711);
+            } catch (ErrnoException e) {
+                System.err.println(e.getMessage());
+            }
+        }
 
         try {
-            DexClassLoader classLoader = new DexClassLoader(sourceDir, ".", librarySearchPath, ClassLoader.getSystemClassLoader());
+            DexClassLoader classLoader = new DexClassLoader(sourceDir, optimizedDirectory, librarySearchPath, ClassLoader.getSystemClassLoader());
             Class<?> cls = classLoader.loadClass("moe.shizuku.manager.shell.Shell");
             cls.getDeclaredMethod("main", String[].class, String.class, IBinder.class, Handler.class)
                     .invoke(null, args, callingPackage, binder, handler);