diff --git a/modules/buffwatch.lua b/modules/buffwatch.lua
index 33e76e0c..e9109b2a 100644
--- a/modules/buffwatch.lua
+++ b/modules/buffwatch.lua
@@ -421,7 +421,7 @@ pfUI:RegisterModule("buffwatch", "vanilla:tbc", function ()
     local br, bg, bb, ba = strsplit(",", config.bordercolor)
     local tr, tg, tb, ta = strsplit(",", config.textcolor)
 
-    pfUI.uf.player.buffbar:SetWidth(config.width == "-1" and C.unitframes.player.width or config.width)
+    pfUI.uf.player.buffbar:SetWidth(config.width == "-1" and pfUI.uf.player:GetWidth() or config.width)
     pfUI.uf.player.buffbar:SetHeight(config.height)
     pfUI.uf.player.buffbar.threshold = tonumber(config.threshold)
     pfUI.uf.player.buffbar.config = config
@@ -448,7 +448,7 @@ pfUI:RegisterModule("buffwatch", "vanilla:tbc", function ()
     local tr, tg, tb, ta = strsplit(",", config.textcolor)
 
     pfUI.uf.player.debuffbar = CreateBuffBarFrame("Player", "HARMFUL")
-    pfUI.uf.player.debuffbar:SetWidth(config.width == "-1" and C.unitframes.player.width or config.width)
+    pfUI.uf.player.debuffbar:SetWidth(config.width == "-1" and pfUI.uf.player:GetWidth() or config.width)
     pfUI.uf.player.debuffbar:SetHeight(config.height)
     pfUI.uf.player.debuffbar.threshold = tonumber(config.threshold)
     pfUI.uf.player.debuffbar.config = config
@@ -476,7 +476,7 @@ pfUI:RegisterModule("buffwatch", "vanilla:tbc", function ()
     local tr, tg, tb, ta = strsplit(",", config.textcolor)
 
     pfUI.uf.target.debuffbar = CreateBuffBarFrame("Target", "HARMFUL")
-    pfUI.uf.target.debuffbar:SetWidth(config.width == "-1" and C.unitframes.target.width or config.width)
+    pfUI.uf.target.debuffbar:SetWidth(config.width == "-1" and pfUI.uf.target:GetWidth() or config.width)
     pfUI.uf.target.debuffbar:SetHeight(config.height)
     pfUI.uf.target.debuffbar.config = config
     pfUI.uf.target.debuffbar.buffcmp = config.sort == "asc" and asc or desc