diff --git a/RotationSolver/Localization/EnumTranslations.cs b/RotationSolver/Localization/EnumTranslations.cs
index 759a4b126..6daa517f4 100644
--- a/RotationSolver/Localization/EnumTranslations.cs
+++ b/RotationSolver/Localization/EnumTranslations.cs
@@ -22,11 +22,11 @@ internal static class EnumTranslations
 
     internal static string ToName(this ComboConditionType type) => type switch
     {
-        ComboConditionType.Bool => "Boolean",
-        ComboConditionType.Byte => "Byte",
-        ComboConditionType.Time => "Time",
-        ComboConditionType.TimeGCD => "GCD",
-        ComboConditionType.Last => "Action",
+        ComboConditionType.Bool => LocalizationManager.RightLang.ComboConditionType_Bool,
+        ComboConditionType.Byte => LocalizationManager.RightLang.ComboConditionType_Byte,
+        ComboConditionType.Time => LocalizationManager.RightLang.ComboConditionType_Time,
+        ComboConditionType.TimeGCD => LocalizationManager.RightLang.ComboConditionType_GCD,
+        ComboConditionType.Last => LocalizationManager.RightLang.ComboConditionType_Last,
         _ => string.Empty,
     };
 
diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
index c83ae19d1..7f9b6d1ac 100644
--- a/RotationSolver/Localization/Strings.cs
+++ b/RotationSolver/Localization/Strings.cs
@@ -219,6 +219,15 @@ internal class Strings
     public string Action_Attack { get; set; } = "Attack";
     #endregion
 
+    #region ComboConditionType
+    public string ComboConditionType_Bool { get; set; } = "Boolean";
+    public string ComboConditionType_Byte { get; set; } = "Byte";
+    public string ComboConditionType_Time { get; set; } = "Time";
+    public string ComboConditionType_GCD { get; set; } = "GCD";
+    public string ComboConditionType_Last { get; set; } = "Last";
+
+    #endregion
+
     #region ActionConditionType
     public string ActionConditionType_Elapsed { get; set; } = "Elapsed";
     public string ActionConditionType_ElapsedGCD { get; set; } = "ElapsedGCD ";
diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs
index 0d89a207f..6a0ad00da 100644
--- a/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs
+++ b/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs
@@ -40,7 +40,9 @@ private IAction GCD(byte abilityRemain, bool helpDefenseAOE, bool helpDefenseSin
         if (helpDefenseSingle && DefenseSingleGCD(out act)) return act;
 
         //Esuna
-        if (specialType == SpecialCommandType.EsunaShieldNorth && TargetUpdater.WeakenPeople.Any() || TargetUpdater.DyingPeople.Any())
+        if ((specialType == SpecialCommandType.EsunaShieldNorth || !HasHostilesInRange)
+            && TargetUpdater.WeakenPeople.Any() 
+            || TargetUpdater.DyingPeople.Any())
         {
             if (Job.GetJobRole() == JobRole.Healer && Esuna.CanUse(out act, mustUse: true)) return act;
         }