diff --git a/modules/actionbar.lua b/modules/actionbar.lua
index 726069e7..a019d1f8 100644
--- a/modules/actionbar.lua
+++ b/modules/actionbar.lua
@@ -513,47 +513,6 @@ pfUI:RegisterModule("actionbar", "vanilla:tbc", function ()
     GameTooltip:Hide()
   end
 
-  -- create the main event and update handler for pfUI actionbars
-  local bars = CreateFrame("Frame", "pfActionBar", UIParent)
-  for event in pairs(global_events) do bars:RegisterEvent(event) end
-  for event in pairs(aura_events) do bars:RegisterEvent(event) end
-  for event in pairs(pet_events) do bars:RegisterEvent(event) end
-  bars.eventcache = { }
-
-  -- refresh actionbar buttons on event
-  bars:SetScript("OnEvent", function()
-    local self = self or this
-
-    -- cache events that are triggered way to often
-    if event == "ACTIONBAR_UPDATE_COOLDOWN" or event == "ACTIONBAR_UPDATE_STATE" then
-      self.eventcache[event] = true
-      return
-    end
-
-    -- handle aura events
-    if aura_events[event] then
-      for j=1,12 do
-        if self[11][j] then ButtonRefresh(self[11][j]) end
-      end
-      return
-    end
-
-    -- handle pet events
-    if pet_events[event] then
-      for j=1,12 do
-        if self[12][j] then ButtonRefresh(self[12][j]) end
-      end
-      return
-    end
-
-    -- handle global events
-    for j=1,12 do
-      for i=1,10 do
-        if self[i][j] then ButtonRefresh(self[i][j]) end
-      end
-    end
-  end)
-
   local function ButtonUpdateCooldown(button)
     if not button then return end
     local start, duration, enable
@@ -591,11 +550,43 @@ pfUI:RegisterModule("actionbar", "vanilla:tbc", function ()
     end
   end
 
-  -- update actionbar buttons
-  local button
-  bars:SetScript("OnUpdate", function()
+  local function BarsEvent(self)
     local self = self or this
 
+    -- cache events that are triggered way to often
+    if event == "ACTIONBAR_UPDATE_COOLDOWN" or event == "ACTIONBAR_UPDATE_STATE" then
+      self.eventcache[event] = true
+      return
+    end
+
+    -- handle aura events
+    if aura_events[event] then
+      for j=1,12 do
+        if self[11][j] then ButtonRefresh(self[11][j]) end
+      end
+      return
+    end
+
+    -- handle pet events
+    if pet_events[event] then
+      for j=1,12 do
+        if self[12][j] then ButtonRefresh(self[12][j]) end
+      end
+      return
+    end
+
+    -- handle global events
+    for j=1,12 do
+      for i=1,10 do
+        if self[i][j] then ButtonRefresh(self[i][j]) end
+      end
+    end
+  end
+
+  local function BarsUpdate(self)
+    local self = self or this
+    local button
+
     -- run cached cooldown events
     if self.eventcache["ACTIONBAR_UPDATE_COOLDOWN"] then
       self.eventcache["ACTIONBAR_UPDATE_COOLDOWN"] = nil
@@ -629,7 +620,20 @@ pfUI:RegisterModule("actionbar", "vanilla:tbc", function ()
         end
       end
     end
-  end)
+  end
+
+  -- create the main event and update handler for pfUI actionbars
+  local bars = CreateFrame("Frame", "pfActionBar", UIParent)
+  for event in pairs(global_events) do bars:RegisterEvent(event) end
+  for event in pairs(aura_events) do bars:RegisterEvent(event) end
+  for event in pairs(pet_events) do bars:RegisterEvent(event) end
+  bars.eventcache = { }
+
+  -- refresh actionbar buttons on event
+  bars:SetScript("OnEvent", BarsEvent)
+
+  -- update actionbar buttons
+  bars:SetScript("OnUpdate", BarsUpdate)
 
   local function CreateActionButton(parent, bar, button)
     -- load config
diff --git a/pfUI-tbc.toc b/pfUI-tbc.toc
index 5535eed1..36ad95e2 100644
--- a/pfUI-tbc.toc
+++ b/pfUI-tbc.toc
@@ -2,7 +2,7 @@
 ## Title: |cff33ffccpf|cffffffffUI |cffaaaaaa[beta]
 ## Author: Shagu
 ## Notes: A complete user interface replacement.
-## Version: 4.3.1
+## Version: 4.3.2
 ## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache
 ## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB
 
diff --git a/pfUI.toc b/pfUI.toc
index a365e791..498bd64e 100644
--- a/pfUI.toc
+++ b/pfUI.toc
@@ -2,7 +2,7 @@
 ## Title: |cff33ffccpf|cffffffffUI
 ## Author: Shagu
 ## Notes: A complete user interface replacement.
-## Version: 4.3.1
+## Version: 4.3.2
 ## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache
 ## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB