diff --git a/app/jni/i2pd_android.cpp b/app/jni/i2pd_android.cpp
index ab7312b..94a52c5 100644
--- a/app/jni/i2pd_android.cpp
+++ b/app/jni/i2pd_android.cpp
@@ -91,8 +91,8 @@ JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_onNetworkStateChanged
 JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_setDataDir
 	(JNIEnv *env, jclass clazz, jstring jdataDir) {
 	auto dataDir = env->GetStringUTFChars(jdataDir, NULL);
-	env->ReleaseStringUTFChars(jdataDir, dataDir);
 	i2p::android::SetDataDir(dataDir);
+	env->ReleaseStringUTFChars(jdataDir, dataDir);
 }
 
 JNIEXPORT jint JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getTransitTunnelsCount
@@ -111,8 +111,8 @@ JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getWebConsAddr
 JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_setLanguage
 	(JNIEnv *env, jclass clazz, jstring jlanguage) {
 	auto language = env->GetStringUTFChars(jlanguage, NULL);
-	env->ReleaseStringUTFChars(jlanguage, language);
 	i2p::android::SetLanguage(language);
+	env->ReleaseStringUTFChars(jlanguage, language);
 }
 
 JNIEXPORT jboolean JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getHTTPProxyState
diff --git a/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java b/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
index 0e23e54..930ff2d 100644
--- a/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
+++ b/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
@@ -29,7 +29,7 @@ public class DaemonWrapper {
     private static final String TAG = "i2pd";
     private final AssetManager assetManager;
     private final ConnectivityManager connectivityManager;
-    private String i2pdpath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/i2pd/";
+    private String i2pdpath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/i2pd";
     private boolean assetsCopied;
 
     private static final String appLocale = Locale.getDefault().getDisplayLanguage(Locale.ENGLISH).toLowerCase(); // lower-case system language (like "english")
diff --git a/build.gradle b/build.gradle
index a74739b..d0562b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
     }
 }