diff --git a/RotationSolver/Updaters/PreviewUpdater.cs b/RotationSolver/Updaters/PreviewUpdater.cs
index 5c012c768..91310596b 100644
--- a/RotationSolver/Updaters/PreviewUpdater.cs
+++ b/RotationSolver/Updaters/PreviewUpdater.cs
@@ -2,6 +2,7 @@
 using Dalamud.Game.Gui.Dtr;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
+using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.Graphics;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using FFXIVClientStructs.FFXIV.Client.System.Memory;
@@ -83,7 +84,7 @@ private static unsafe void UpdateCastBar()
     {
         if (_isTarDead)
         {
-            //RSCommands.SubmitToChat("/acan");
+            UIState.Instance()->Hotbar.CancelCast();
         }
 
         var nowMove = _canMove && Service.Configuration.CastingDisplay;
diff --git a/RotationSolver/Windows/RotationConfigWindow_Param.cs b/RotationSolver/Windows/RotationConfigWindow_Param.cs
index 5f1aa2814..8228dccf2 100644
--- a/RotationSolver/Windows/RotationConfigWindow_Param.cs
+++ b/RotationSolver/Windows/RotationConfigWindow_Param.cs
@@ -100,11 +100,11 @@ private void DrawParamDelay()
         DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_NotInCombatDelay,
             ref Service.Configuration.NotInCombatDelayMin, ref Service.Configuration.NotInCombatDelayMax);
 
-        //if (Service.Configuration.UseStopCasting)
-        //{
-        //    DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_StopCastingDelay,
-        //        ref Service.Configuration.StopCastingDelayMin, ref Service.Configuration.StopCastingDelayMax);
-        //}
+        if (Service.Configuration.UseStopCasting)
+        {
+            DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_StopCastingDelay,
+                ref Service.Configuration.StopCastingDelayMin, ref Service.Configuration.StopCastingDelayMax);
+        }
 
         if (Service.Configuration.UseWorkTask)
         {
@@ -144,8 +144,8 @@ private void DrawParamAdvanced()
                 LocalizationManager.RightLang.Configwindow_Param_PoslockDescription);
         }
 
-        //DrawCheckBox(LocalizationManager.RightLang.Configwindow_Param_UseStopCasting,
-        //    ref Service.Configuration.UseStopCasting);
+        DrawCheckBox(LocalizationManager.RightLang.Configwindow_Param_UseStopCasting,
+            ref Service.Configuration.UseStopCasting);
     }
 
     private void DrawParamDisplay()