diff --git a/composer.json b/composer.json
index 6dc6574f..7aa0e6d3 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
         "danog/primemodule": "^1",
         "danog/magicalserializer": "^1.0",
         "phpseclib/phpseclib": "dev-master#f715b2928976aaef389839a056c947aa8023277b as 2.0.15",
-        "vlucas/phpdotenv": "^3",
         "erusev/parsedown": "^1.7",
         "ext-mbstring": "*",
         "ext-json": "*",
@@ -36,6 +35,7 @@
         "amphp/uri": "dev-master"
     },
     "require-dev": {
+        "vlucas/phpdotenv": "^3",
         "phpdocumentor/reflection-docblock": "^4.3",
         "ennexa/amp-update-cache": "dev-master",
         "phpunit/phpunit": "^8",
diff --git a/src/danog/MadelineProto/API.php b/src/danog/MadelineProto/API.php
index baa335e8..6fa168c3 100644
--- a/src/danog/MadelineProto/API.php
+++ b/src/danog/MadelineProto/API.php
@@ -108,14 +108,14 @@ class API extends InternalDoc
                         $tounserialize = \str_replace('O:26:"danog\\MadelineProto\\Button":', 'O:35:"danog\\MadelineProto\\TL\\Types\\Button":', $tounserialize);
                         $changed = true;
                     }
-                    if (\strpos($tounserialize, 'C:25:"phpseclib\Math\BigInteger') !== false) {
-                        $tounserialize = \str_replace('C:25:"phpseclib\Math\BigInteger', 'C:26:"phpseclib3\Math\BigInteger', $tounserialize);
-                        $changed = true;
-                    }
                     if (\strpos($e->getMessage(), "Erroneous data format for unserializing 'phpseclib\\Math\\BigInteger'") === 0) {
                         $tounserialize = \str_replace('phpseclib\\Math\\BigInteger', 'phpseclib\\Math\\BigIntegor', $tounserialize);
                         $changed = true;
                     }
+                    if (\strpos($tounserialize, 'C:25:"phpseclib\\Math\\BigInteger') !== false) {
+                        $tounserialize = \str_replace('C:25:"phpseclib\\Math\\BigInteger', 'C:26:"phpseclib3\\Math\\BigInteger', $tounserialize);
+                        $changed = true;
+                    }
 
                     Logger::log((string) $e, Logger::ERROR);
                     if (!$changed) {
diff --git a/src/danog/MadelineProto/Stream/MTProtoTransport/ObfuscatedStream.php b/src/danog/MadelineProto/Stream/MTProtoTransport/ObfuscatedStream.php
index d2970670..6c84cbba 100644
--- a/src/danog/MadelineProto/Stream/MTProtoTransport/ObfuscatedStream.php
+++ b/src/danog/MadelineProto/Stream/MTProtoTransport/ObfuscatedStream.php
@@ -20,8 +20,6 @@ namespace danog\MadelineProto\Stream\MTProtoTransport;
 
 use Amp\Promise;
 use Amp\Socket\EncryptableSocket;
-use danog\MadelineProto\Stream\Async\Buffer;
-use danog\MadelineProto\Stream\Async\BufferedStream;
 use danog\MadelineProto\Stream\Async\Stream;
 use danog\MadelineProto\Stream\BufferedProxyStreamInterface;
 use danog\MadelineProto\Stream\Common\CtrStream;