diff --git a/ButtonForge/Button.lua b/ButtonForge/Button.lua
index 9de1a4e..ee90438 100644
--- a/ButtonForge/Button.lua
+++ b/ButtonForge/Button.lua
@@ -535,6 +535,13 @@ function Button:SetCommandFromTriplet(Command, Data, Subvalue, Subsubvalue)
 	
 	if (Command == "spell") then
 		self:SetCommandSpell(Subsubvalue);  --Data = Index, Subvalue = Book (spell/pet)
+	elseif (Command == "petaction") then
+		if (Data > 5) then
+			-- "Assist, Attack, Defensive, Passive, Follow, Move To, Stay" cause issues so lets ignore them for now. They all have their id between 0 and 5.
+			self:SetCommandSpell(Data);
+		else
+			return false;
+		end
 	elseif (Command == "item") then
 		self:SetCommandItem(Data, Subvalue);   --Data = Id, Subvalue = Link
 	elseif (Command == "macro") then
diff --git a/ButtonForge/ButtonForge.toc b/ButtonForge/ButtonForge.toc
index 3048d98..df91436 100644
--- a/ButtonForge/ButtonForge.toc
+++ b/ButtonForge/ButtonForge.toc
@@ -1,7 +1,7 @@
 ## Interface: 80200
 ## Title: Button Forge
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
-## Version: 0.9.50.1
+## Version: 0.9.50.2
 ## Author: Massiner of Nathrezim
 ## SavedVariables: ButtonForgeGlobalSettings, ButtonForgeGlobalProfiles, ButtonForgeGlobalBackup
 ## SavedVariablesPerCharacter: ButtonForgeSave, BFSave
diff --git a/ButtonForge/Const.lua b/ButtonForge/Const.lua
index 78a2587..97484a8 100644
--- a/ButtonForge/Const.lua
+++ b/ButtonForge/Const.lua
@@ -11,7 +11,6 @@ Const.SUMMON_RANDOM_FAVORITE_MOUNT_SPELL = 150544;
 Const.SUMMON_RANDOM_FAVORITE_MOUNT_ID = 268435455;
 Const.SUMMON_RANDOM_FAVORITE_BATTLE_PET_ID = "BattlePet-0-FFFFFFFFFFFFFF";
 Const.SUMMON_RANDOM_FAVORITE_BATTLE_PET_TEXTURE = "Interface/Icons/INV_Pet_Achievement_CaptureAPetFromEachFamily_Battle";
-Const.PVP_SPELL_GLADIATORS_MEDALLION = 208683;
 Const.Version				= 0.9;
 Const.VersionMinor			= 50;
 Const.MAX_ACCOUNT_MACROS 	= 120;
diff --git a/ButtonForge/Util.lua b/ButtonForge/Util.lua
index 2e094cb..368e467 100644
--- a/ButtonForge/Util.lua
+++ b/ButtonForge/Util.lua
@@ -1536,15 +1536,7 @@ function Util.SetCursor(Command, Data, Subvalue, Subsubvalue)
 	UILib.StopDraggingIcon();
 	SpellFlyout:Hide();
 	if (Command == "spell") then
-		local SpellName = GetSpellInfo(Subsubvalue);
-		-- For some reason, that PVP spell needs to be called with PickupSpell instead of PickupSpellBookItem
-		if ( Subsubvalue == Const.PVP_SPELL_GLADIATORS_MEDALLION ) then
-			PickupSpell(Subsubvalue);
-		elseif ( SpellName ) then
-			PickupSpellBookItem(SpellName);
-		else
-			PickupSpell(Subsubvalue);
-		end
+		PickupSpell(Subsubvalue);
 	elseif (Command == "item") then
 		PickupItem(Data);
 	elseif (Command == "macro") then