diff --git a/handlers/keys/key_renew.py b/handlers/keys/key_renew.py
index 7668552b..e7fe2dba 100644
--- a/handlers/keys/key_renew.py
+++ b/handlers/keys/key_renew.py
@@ -596,7 +596,7 @@ async def handle_renew_config_confirm(callback_query: CallbackQuery, state: FSMC
 
         client_id = data.get("renew_client_id")
         email = data.get("renew_key_name")
-        tariff_id = int(callback_query.data.split("|")[1])
+        tariff_id = data.get("renew_tariff_id")
         selected_devices = data.get("config_selected_device_limit")
         selected_traffic_gb = data.get("config_selected_traffic_gb")
 
diff --git a/handlers/tariffs/buy/key_tariffs.py b/handlers/tariffs/buy/key_tariffs.py
index f581bbcd..1305a062 100644
--- a/handlers/tariffs/buy/key_tariffs.py
+++ b/handlers/tariffs/buy/key_tariffs.py
@@ -822,9 +822,7 @@ async def select_tariff_plan(callback_query: CallbackQuery, session: Any, state:
         )
         return
 
-    data = await state.get_data()
-    if data.get("renew_mode") != "renew":
-        await state.update_data(renew_mode=None)
+    await state.update_data(renew_mode=None)
 
     if tariff.get("configurable"):
         logger.info(f"[TARIFF_CFG] select_tariff_plan configurable: tg_id={tg_id} tariff_id={tariff_id}")
diff --git a/utils/versioning.py b/utils/versioning.py
index 3f6e3a20..bcd489ac 100644
--- a/utils/versioning.py
+++ b/utils/versioning.py
@@ -92,4 +92,4 @@ def get_git_commit_number() -> str:
 
 
 def get_version() -> str:
-    return f"v.6-b1604162029 {get_git_commit_number()}"
+    return f"v.6-b1204121200 {get_git_commit_number()}"