diff --git a/Button.lua b/Button.lua
index 9854265..ea53b2d 100644
--- a/Button.lua
+++ b/Button.lua
@@ -438,7 +438,7 @@ function Button:EventHandler(event, arg1)
 			self:StartFlash()
 		end
 	elseif ( event == "STOP_AUTOREPEAT_SPELL" ) then
-		if ( self:IsFlashing() and not IsAttackAction(self.action) ) then
+		if ( self.flashing == 1 and not IsAttackAction(self.action) ) then
 			self:StopFlash()
 		end
 	end
diff --git a/PetBar.lua b/PetBar.lua
index 9dc17e2..439cb2e 100644
--- a/PetBar.lua
+++ b/PetBar.lua
@@ -105,8 +105,8 @@ function PetButtonPrototype:Update()
 		self.tooltipName = _G[name]
 	end
 	
-	self.isToken = isToken;
-	self.tooltipSubtext = subtext;
+	self.isToken = isToken
+	self.tooltipSubtext = subtext
 	self:SetChecked(isActive and 1 or 0)
 	if autoCastAllowed then
 		self.autocastable:Show()