diff --git a/IceHUD.toc b/IceHUD.toc
index 359bc3e..3929249 100644
--- a/IceHUD.toc
+++ b/IceHUD.toc
@@ -3,7 +3,7 @@
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f -Ace2-|r
 ## Notes: Another HUD addon
-## Version: 0.8.1 ($Revision$)
+## Version: 0.8.2 ($Revision$)
 ## SavedVariables: IceCoreDB
 ## OptionalDeps: Ace2, DewdropLib, DruidBar, SoleManax, MobHealth
 ## X-Embeds: Ace2, DewdropLib
diff --git a/modules/TargetInfo.lua b/modules/TargetInfo.lua
index c82d586..47e92f3 100644
--- a/modules/TargetInfo.lua
+++ b/modules/TargetInfo.lua
@@ -50,6 +50,16 @@ function TargetInfo.prototype:Enable(core)
 	self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
 
 	self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
+	
+	RegisterUnitWatch(self.frame)
+end
+
+
+-- OVERRIDE
+function TargetInfo.prototype:Disable(core)
+	TargetInfo.super.prototype.Disable(self, core)
+	
+	UnregisterUnitWatch(self.frame)
 end
 
 
@@ -284,9 +294,8 @@ function TargetInfo.prototype:CreateFrame(redraw)
 
 	self.frame:SetScale(self.moduleSettings.scale)
 	
-	-- register showing/hiding the frame depending on current target
+	-- set showing/hiding the frame depending on current target
 	self.frame:SetAttribute("unit", target)
-	RegisterUnitWatch(self.frame)
 
 	self.frame:SetFrameStrata("BACKGROUND")
 	self.frame:SetWidth(self.width)
diff --git a/modules/TargetOfTarget.lua b/modules/TargetOfTarget.lua
index d4b5f51..6df4cb1 100644
--- a/modules/TargetOfTarget.lua
+++ b/modules/TargetOfTarget.lua
@@ -133,13 +133,18 @@ function TargetOfTarget.prototype:Enable(core)
 	
 	self:ScheduleRepeatingEvent(self.elementName, self.Update, 0.3, self)
 	
+	RegisterUnitWatch(self.frame)
+	
 	self:Update()
 end
 
 
 function TargetOfTarget.prototype:Disable(core)
 	TargetOfTarget.super.prototype.Disable(self, core)
+	
 	self:CancelScheduledEvent(self.elementName)
+	
+	UnregisterUnitWatch(self.frame)
 end
 
 
@@ -150,7 +155,6 @@ function TargetOfTarget.prototype:CreateFrame()
 	if not (self.frame) then
 		self.frame = CreateFrame("Button", "IceHUD_"..self.elementName, self.parent, "SecureUnitButtonTemplate")
 		self.frame:SetAttribute("unit", self.unit)
-		RegisterUnitWatch(self.frame)
 	end
 
 	self.frame:SetFrameStrata("BACKGROUND")