diff --git a/app/bybit/open_positions.py b/app/bybit/open_positions.py
index bf7e675..9c98ee6 100644
--- a/app/bybit/open_positions.py
+++ b/app/bybit/open_positions.py
@@ -215,6 +215,8 @@ async def trading_cycle(
     try:
         user_deals_data = await rq.get_user_deal_by_symbol(tg_id=tg_id, symbol=symbol)
         user_auto_trading_data = await rq.get_user_auto_trading(tg_id=tg_id, symbol=symbol)
+        user_risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
+        commission_fee = user_risk_management_data.commission_fee
         total_fee = user_auto_trading_data.total_fee
         trade_mode = user_deals_data.trade_mode
         margin_type = user_deals_data.margin_type
@@ -243,6 +245,10 @@ async def trading_cycle(
             symbol=symbol,
             leverage=leverage,
         )
+        if commission_fee == "Yes_commission_fee":
+            total_fee = total_fee
+        else:
+            total_fee = 0
 
         if trade_mode == "Switch":
             if side == "Buy":
diff --git a/app/bybit/telegram_message_handler.py b/app/bybit/telegram_message_handler.py
index bb95435..45699b4 100644
--- a/app/bybit/telegram_message_handler.py
+++ b/app/bybit/telegram_message_handler.py
@@ -117,14 +117,7 @@ class TelegramMessageHandler:
                 fee = 0
 
             exec_pnl = format_value(execution.get("execPnl"))
-            risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
-            commission_fee = risk_management_data.commission_fee
-
-            if commission_fee == "Yes_commission_fee":
-                total_pnl = safe_float(exec_pnl) - safe_float(exec_fee) - fee
-            else:
-                total_pnl = safe_float(exec_pnl)
-
+            total_pnl = safe_float(exec_pnl) - safe_float(exec_fee) - fee
             header = (
                 "Сделка закрыта:" if safe_float(closed_size) > 0 else "Сделка открыта:"
             )
diff --git a/app/telegram/handlers/main_settings/additional_settings.py b/app/telegram/handlers/main_settings/additional_settings.py
index ad67eeb..894e3ac 100644
--- a/app/telegram/handlers/main_settings/additional_settings.py
+++ b/app/telegram/handlers/main_settings/additional_settings.py
@@ -43,7 +43,7 @@ async def settings_for_trade_mode(
             text="Выберите режим торговли:\n\n"
                  "Лонг - все сделки серии открываются на покупку.\n"
                  "Шорт - все сделки серии открываются на продажу.\n"
-                 "Свитч - направление первой сделки серии меняется по переменно.\n",
+                 "Свитч - направление каждой сделки в рамках серии меняется попеременно.\n",
             reply_markup=kbi.trade_mode,
         )
         logger.debug(