diff --git a/src/char/i_char.py b/src/char/i_char.py
index 41135d5..5d18f87 100644
--- a/src/char/i_char.py
+++ b/src/char/i_char.py
@@ -304,16 +304,16 @@ class IChar:
         return False
 
     def _pre_buff_cta(self):
+        skill_before = cut_roi(grab(), Config().ui_roi["skill_right"])
         keyboard.send(Config().char["weapon_switch"])
         wait(0.3, 0.35)
-        keyboard.send(Config().char["battle_orders"])
-        wait(0.1, 0.2)
-        mouse.click(button="right")
+        self._select_skill(skill="battle_command", mouse_click_type="right", delay=(0.1, 0.2))
         wait(self._cta_cast_duration, self._cta_cast_duration)
-        keyboard.send(Config().char["battle_command"])
-        wait(0.1, 0.2)
-        mouse.click(button="right")
+        self._select_skill(skill="battle_orders", mouse_click_type="right", delay=(0.1, 0.2))
         wait(self._cta_cast_duration, self._cta_cast_duration)
+        if Config().char["buff_with_cta"]:
+            self.cast_buffs(self._cta_cast_duration)
+        wait(0.08, 0.08)
         keyboard.send(Config().char["weapon_switch"])
         wait(0.3, 0.35)
         return True