diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
index d2bc3ee4..2bcf294f 100644
--- a/pyrogram/client/client.py
+++ b/pyrogram/client/client.py
@@ -1092,7 +1092,7 @@ class Client(Methods, BaseClient):
 
             if include is None:
                 for path in sorted(Path(root).rglob("*.py")):
-                    module_path = os.path.splitext(str(path))[0].replace("/", ".")
+                    module_path = '.'.join(path.parent.parts + (path.stem,))
                     module = import_module(module_path)
 
                     for name in vars(module).keys():
diff --git a/pyrogram/client/types/bots/inline_keyboard_button.py b/pyrogram/client/types/bots/inline_keyboard_button.py
index cd30f373..cc829cb1 100644
--- a/pyrogram/client/types/bots/inline_keyboard_button.py
+++ b/pyrogram/client/types/bots/inline_keyboard_button.py
@@ -63,7 +63,7 @@ class InlineKeyboardButton(PyrogramType):
                  callback_game: CallbackGame = None):
         super().__init__(None)
 
-        self.text = text
+        self.text = str(text)
         self.url = url
         self.callback_data = callback_data
         self.switch_inline_query = switch_inline_query
diff --git a/pyrogram/client/types/bots/keyboard_button.py b/pyrogram/client/types/bots/keyboard_button.py
index e93eccb3..3c7c2bd6 100644
--- a/pyrogram/client/types/bots/keyboard_button.py
+++ b/pyrogram/client/types/bots/keyboard_button.py
@@ -46,7 +46,7 @@ class KeyboardButton(PyrogramType):
                  request_location: bool = None):
         super().__init__(None)
 
-        self.text = text
+        self.text = str(text)
         self.request_contact = request_contact
         self.request_location = request_location