diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c62a9f553b..113620f871 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,6 +59,15 @@
                 <data
                     android:host="www.tangem.com"
                     android:scheme="http" />
+                <data
+                    android:host="www.tangem.com"
+                    android:scheme="https" />
+                <data
+                    android:host="tangem.com"
+                    android:scheme="http" />
+                <data
+                    android:host="tangem.com"
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.nfc.action.TECH_DISCOVERED" />
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java
index 0ec02300e7..81437febfa 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java
@@ -317,15 +317,16 @@ public class ServerApiElectrum {
             // install the all-trusting host verifier
             HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
 
-            SSLSocket sslSocket;
+            Socket sslSocket = new Socket();
 
             List<ElectrumRequest> result = new ArrayList<>();
             Collections.addAll(result, electrumRequest);
 
             try {
                 Log.i(TAG, host + " " + port);
-                sslSocket = (SSLSocket) sf.createSocket(host, port);
+                sslSocket.connect(new InetSocketAddress(host,port), 3000);
                 sslSocket.setSoTimeout(3000);
+                sslSocket = sf.createSocket(sslSocket, host, port, true);
                 try {
                     OutputStream os = sslSocket.getOutputStream();
                     OutputStreamWriter out = new OutputStreamWriter(os, "UTF-8");
diff --git a/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt
index 4331bf3600..bb76b8a698 100644
--- a/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt
+++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt
@@ -2,13 +2,13 @@ package com.tangem.wallet.bch
 
 enum class BitcoinCashNode(val host: String, val port: Int, val proto: String) {
     N_001("electrumx.hillsideinternet.com", 50002, "ssl"),
-    N_002("dedi.jochen-hoenicke.de", 51002, "ssl"),
-    N_003("crypto.mldlabs.com", 50002, "ssl"),
-    N_004("electroncash.cascharia.com", 50002, "ssl"),
-    N_005("bch.crypto.mldlabs.com", 50002, "ssl"),
+//    N_002("dedi.jochen-hoenicke.de", 51002, "ssl"),
+//    N_003("crypto.mldlabs.com", 50002, "ssl"),
+//    N_004("electroncash.cascharia.com", 50002, "ssl"),
+//    N_005("bch.crypto.mldlabs.com", 50002, "ssl"),
     N_006("electron.coinucopia.io", 50002, "ssl"),
     N_007("blackie.c3-soft.com", 50002, "ssl"),
     N_008("electrum.imaginary.cash", 50002, "ssl"),
-    N_009("bitcoincash.quangld.com", 50002, "ssl"),
-    N_010("bch.stitthappens.com", 50002, "ssl"),
+//    N_009("bitcoincash.quangld.com", 50002, "ssl"),
+//    N_010("bch.stitthappens.com", 50002, "ssl"),
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/wallet/bch/CashAddr.java b/app/src/main/java/com/tangem/wallet/bch/CashAddr.java
index 25c6851c16..5dbf111c97 100644
--- a/app/src/main/java/com/tangem/wallet/bch/CashAddr.java
+++ b/app/src/main/java/com/tangem/wallet/bch/CashAddr.java
@@ -44,7 +44,8 @@ public class CashAddr {
         byte[] checksumBytes = calculateChecksumBytesPolymod(allChecksumInput);
         checksumBytes = convertBits(checksumBytes, 8, 5, true);
         String cashAddress = BitcoinCashBase32.encode(concatenateByteArrays(payloadBytes, checksumBytes));
-        return prefixString + SEPARATOR + cashAddress;
+        //return prefixString + SEPARATOR + cashAddress;
+        return cashAddress;
     }
 
     public static BitcoinCashAddressDecodedParts decodeCashAddress(String bitcoinCashAddress) {
diff --git a/build.gradle b/build.gradle
index a07f7985d1..ba5d47436c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }