diff --git a/src/danog/MadelineProto/MTProtoTools/CallHandler.php b/src/danog/MadelineProto/MTProtoTools/CallHandler.php
index 3365d206..3498d3a7 100644
--- a/src/danog/MadelineProto/MTProtoTools/CallHandler.php
+++ b/src/danog/MadelineProto/MTProtoTools/CallHandler.php
@@ -185,9 +185,8 @@ trait CallHandler
                     } catch (\danog\MadelineProto\NothingInTheSocketException $e) {
                         $last_error = 'Nothing in the socket';
                         \danog\MadelineProto\Logger::log('An error getting response of method '.$method.': '.$e->getMessage().' in '.basename($e->getFile(), '.php').' on line '.$e->getLine().'. Retrying...', \danog\MadelineProto\Logger::WARNING);
-                        if ($this->is_http($aargs['datacenter'])) {
-                            $this->close_and_reopen($aargs['datacenter']);
-                        }
+                        if ($res_count > 3) $this->close_and_reopen($aargs['datacenter']);
+var_dump($res_count);
                         continue; //2;
                     }
                 }
diff --git a/src/danog/MadelineProto/TL/Conversion/BotAPI.php b/src/danog/MadelineProto/TL/Conversion/BotAPI.php
index ce6a984e..5cd67e2e 100644
--- a/src/danog/MadelineProto/TL/Conversion/BotAPI.php
+++ b/src/danog/MadelineProto/TL/Conversion/BotAPI.php
@@ -334,28 +334,28 @@ trait BotAPI
         return $arguments;
     }
 
-    public function parse_node($node, &$entities, &$nmessage, $recursive = true)
+    public function parse_node($node, &$entities, &$new_message, $recursive = true)
     {
         switch ($node->nodeName) {
             case 'br':
-                $nmessage .= "\n";
+                $new_message .= "\n";
                 break;
             case 'b':
             case 'strong':
                 $text = $this->html_entity_decode($node->textContent);
-                $entities[] = ['_' => 'messageEntityBold', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text)];
-                $nmessage .= $text;
+                $entities[] = ['_' => 'messageEntityBold', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text)];
+                $new_message .= $text;
                 break;
             case 'i':
             case 'em':
                 $text = $this->html_entity_decode($node->textContent);
-                $entities[] = ['_' => 'messageEntityItalic', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text)];
-                $nmessage .= $text;
+                $entities[] = ['_' => 'messageEntityItalic', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text)];
+                $new_message .= $text;
                 break;
             case 'code':
                 $text = $this->html_entity_decode($node->textContent);
-                $entities[] = ['_' => 'messageEntityCode', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text)];
-                $nmessage .= $text;
+                $entities[] = ['_' => 'messageEntityCode', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text)];
+                $new_message .= $text;
                 break;
             case 'pre':
                 $text = $this->html_entity_decode($node->textContent);
@@ -363,24 +363,24 @@ trait BotAPI
                 if ($language === null) {
                     $language = '';
                 }
-                $entities[] = ['_' => 'messageEntityPre', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text), 'language' => $language];
-                $nmessage .= $text;
+                $entities[] = ['_' => 'messageEntityPre', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'language' => $language];
+                $new_message .= $text;
                 break;
             case 'p':
                 foreach ($node->childNodes as $node) {
-                    $this->parse_node($node, $entities, $nmessage);
+                    $this->parse_node($node, $entities, $new_message);
                 }
                 break;
             case 'a':
                 $text = $this->html_entity_decode($node->textContent);
                 $href = $node->getAttribute('href');
-                if (preg_match('|mention:|', $href)) {
-                    $mention = $this->get_info(str_replace('mention:', '', $href));
+                if (preg_match('|mention:(.*)|', $href, $matches) || preg_match('|tg://user\?id=(.*)|', $href, $matches)) {
+                    $mention = $this->get_info($matches[1]);
                     if (!isset($mention['InputUser'])) {
                         throw new \danog\MadelineProto\Exception(\danog\MadelineProto\Lang::$current_lang['peer_not_in_db']);
                     }
-                    $entities[] = ['_' => 'inputMessageEntityMentionName', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text), 'user_id' => $mention['InputUser']];
-                } elseif (preg_match('|buttonurl:|', $href)) {
+                    $entities[] = ['_' => 'inputMessageEntityMentionName', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'user_id' => $mention['InputUser']];
+                } elseif (preg_match('|buttonurl:(.*)|', $href)) {
                     if (!isset($entities['buttons'])) {
                         $entities['buttons'] = [];
                     }
@@ -391,12 +391,12 @@ trait BotAPI
                     }
                     break;
                 } else {
-                    $entities[] = ['_' => 'messageEntityTextUrl', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text), 'url' => $href];
+                    $entities[] = ['_' => 'messageEntityTextUrl', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'url' => $href];
                 }
-                $nmessage .= $text;
+                $new_message .= $text;
                 break;
             default:
-                $nmessage .= $this->html_entity_decode($node->nodeValue);
+                $new_message .= $this->html_entity_decode($node->nodeValue);
                 break;
         }
     }
@@ -411,7 +411,7 @@ trait BotAPI
             $arguments['parse_mode'] = 'HTML';
         }
         if (preg_match('/html/i', $arguments['parse_mode'])) {
-            $nmessage = '';
+            $new_message = '';
 
             try {
                 $arguments['message'] = $this->html_fixtags($arguments['message']);
@@ -421,7 +421,7 @@ trait BotAPI
                     $arguments['entities'] = [];
                 }
                 foreach ($dom->getElementsByTagName('body')->item(0)->childNodes as $node) {
-                    $this->parse_node($node, $arguments['entities'], $nmessage);
+                    $this->parse_node($node, $arguments['entities'], $new_message);
                 }
                 if (isset($arguments['entities']['buttons'])) {
                     $arguments['reply_markup'] = $this->build_rows($arguments['entities']['buttons']);
@@ -431,7 +431,7 @@ trait BotAPI
             } catch (\DOMException $e) {
             } catch (\danog\MadelineProto\Exception $e) {
             }
-            $arguments['message'] = $nmessage;
+            $arguments['message'] = $new_message;
         }
 
         return $arguments;