diff --git a/IceCastBar.lua b/IceCastBar.lua
index 4cede91..46f2bb5 100644
--- a/IceCastBar.lua
+++ b/IceCastBar.lua
@@ -247,6 +247,14 @@ function IceCastBar.prototype:StopBar()
 	self.frame:SetScript("OnUpdate", nil)
 end
 
+-- make sure that our custom OnUpdate is restored whenever a Redraw happens
+function IceCastBar.prototype:Redraw()
+	IceCastBar.super.prototype.Redraw(self)
+
+	if self.action ~= IceCastBar.Actions.None then
+		self.frame:SetScript("OnUpdate", function() self:OnUpdate() end)
+	end
+end
 
 function IceCastBar.prototype:GetShortRank(rank)
 	if (rank) then
diff --git a/modules/TargetCast.lua b/modules/TargetCast.lua
index 1f6619b..2ed9330 100644
--- a/modules/TargetCast.lua
+++ b/modules/TargetCast.lua
@@ -67,7 +67,7 @@ function TargetCast.prototype:TargetChanged(unit)
 		return
 	end
 
-	local spell, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
+	local spell, _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
 	if (spell) then
 		self.notInterruptible = notInterruptibleCast
 		self:StartBar(IceCastBar.Actions.Cast)