diff --git a/3pT2BS/3pT2BS.lua b/3pT2BS/3pT2BS.lua
index d92b7f9..7d8ea9a 100644
--- a/3pT2BS/3pT2BS.lua
+++ b/3pT2BS/3pT2BS.lua
@@ -32,7 +32,7 @@ end
 
 local button = CreateFrame("Button", "3pT2BS", UIParent, "SecureActionButtonTemplate")
 button:SetAttribute("type", "macro")
-button:SetAttribute("macrotext", wrathOff)
+button:SetAttribute("macrotext", actions.takeWrathOff)
 button:SetScript("PreClick", function (self, button, down)
     if InCombatLockdown() then
         return
@@ -49,7 +49,7 @@ button:SetScript("PreClick", function (self, button, down)
     if not has3pT2() then
         return self:SetAttribute("macrotext", actions.putWrathOn)
     end
-    return self:SetAttribute("macrotext", actions.castBattleShout)
+    return self:SetAttribute("macrotext", actions.castBattleShout .. actions.takeWrathOff)
 end)
 
 
@@ -88,7 +88,6 @@ function events:ADDON_LOADED()
             },
             ["castBattleShout"] = {
                 "/cancelaura Bloodrage",
-                "/stopmacro [combat]",
                 "/cast Battle Shout",
             },
             ["takeWrathOff"] = {