diff --git a/HealBot_Controller_Events.lua b/HealBot_Controller_Events.lua
index 6af4f53..4550b94 100644
--- a/HealBot_Controller_Events.lua
+++ b/HealBot_Controller_Events.lua
@@ -171,6 +171,13 @@ function HealBot_OnUpdate(this, arg1)
         HealBot_Action_RefreshPower(unitID)
     end
     
+    local powerID, _ = next(HealBot_View_DirtyPower)
+    while powerID do
+        HealBot_Action_RefreshPower(powerID)
+        HealBot_View_DirtyPower[powerID] = nil
+        powerID, _ = next(HealBot_View_DirtyPower)
+    end
+    
     if HealBot_EquipChangeTimer > 0 then
         HealBot_EquipChangeTimer = HealBot_EquipChangeTimer - arg1
         if HealBot_EquipChangeTimer <= 0 then
diff --git a/HealBot_View_Layout.lua b/HealBot_View_Layout.lua
index 661613a..efd88ac 100644
--- a/HealBot_View_Layout.lua
+++ b/HealBot_View_Layout.lua
@@ -38,6 +38,7 @@ function HealBot_HealthColor(unit, hlth, maxhlth)
             local db = color.B
             return dr, dg, db, HealBot_Config.Barcola[HealBot_Config.Current_Skin];
         end
+        return dr, dg, db, HealBot_Config.Barcola[HealBot_Config.Current_Skin];
     end
     
     local text = UnitName(unit);