diff --git a/SmartBuff.buffs.lua b/SmartBuff.buffs.lua
index 41d2088..13c0e67 100644
--- a/SmartBuff.buffs.lua
+++ b/SmartBuff.buffs.lua
@@ -426,6 +426,8 @@ function SMARTBUFF_InitSpellIDs()
   -- track humanoids
   SMARTBUFF_DRUID_TRACK         = GetSpellInfo(5225);       --"Track Humanoids"
   
+  S.ChainDruidBuffs = { SMARTBUFF_MOTW, SMARTBUFF_GOTW }; 
+
 
   -- Priest - Updated 8/5/2023 ----------------------------------------------------------------------
   -- buffs
@@ -864,8 +866,8 @@ function SMARTBUFF_InitSpellList()
   if (SMARTBUFF_PLAYERCLASS == "DRUID") then          -- updated 28/5/2023 Codermik
     SMARTBUFF_BUFFLIST = {
       -- buffs
-      {SMARTBUFF_MOTW, 30, SMARTBUFF_CONST_GROUP, {1,10,20,30,40,50,60,70,80}, "HPET;WPET;DKPET"},
-      {SMARTBUFF_GOTW, 60, SMARTBUFF_CONST_GROUP, {50,60,70,80}, "HPET;WPET;DKPET"},
+      {SMARTBUFF_MOTW, 30, SMARTBUFF_CONST_GROUP, {1,10,20,30,40,50,60,70,80}, "HPET;WPET;DKPET", S.ChainDruidBuffs},
+      {SMARTBUFF_GOTW, 60, SMARTBUFF_CONST_GROUP, {50,60,70,80}, "HPET;WPET;DKPET", S.ChainDruidBuffs},
       {SMARTBUFF_THORNS, 10, SMARTBUFF_CONST_GROUP, nil, "MAGE;WARLOCK;ROGUE;PALADIN;WARRIOR;DRUID;HUNTER;SHAMAN;DEATHKNIGHT;MONK;DEMONHUNTER;EVOKER;HPET;WPET;DKPET"},
       {SMARTBUFF_BARKSKIN, 0.25, SMARTBUFF_CONST_FORCESELF},
 	  {SMARTBUFF_NATURESGRASP, 0.25, SMARTBUFF_CONST_FORCESELF},
diff --git a/SmartBuff.lua b/SmartBuff.lua
index d02e3ce..77cb855 100644
--- a/SmartBuff.lua
+++ b/SmartBuff.lua
@@ -7,9 +7,9 @@
 -- Cast the most important buffs on you, tanks or party/raid members/pets.
 -------------------------------------------------------------------------------
 
-SMARTBUFF_DATE          = "290723";
+SMARTBUFF_DATE          = "310823";
 
-SMARTBUFF_VERSION       = "r49."..SMARTBUFF_DATE;
+SMARTBUFF_VERSION       = "r50."..SMARTBUFF_DATE;
 SMARTBUFF_VERSIONNR     = 30402;
 SMARTBUFF_TITLE         = "SmartBuff";
 SMARTBUFF_SUBTITLE      = "Supports you in casting buffs";
@@ -25,7 +25,7 @@ local SmartbuffCommands = { "SBCVER", "SBCCMD", "SBCSYC" }
 local SmartbuffSession = true;
 local SmartbuffVerCheck = false;					-- for my use when checking guild users/testers versions  :)
 local buildInfo = select(4, GetBuildInfo())
-local SmartbuffRevision = 49;
+local SmartbuffRevision = 50;
 local SmartbuffVerNotifyList = {}
 
 -- Using LibRangeCheck-2.0 by Mitchnull
@@ -2170,6 +2170,9 @@ function SMARTBUFF_BuffUnit(unit, subgroup, mode, spell)
                   if (SMARTBUFF_IsPlayer(unit)) then
                     if (cBuffTimer[unit] ~= nil and cBuffTimer[unit][buffnS] ~= nil) then
                       local tbt = cBuff.DurationS - (time - cBuffTimer[unit][buffnS]);
+                        if type(bt) ~= "number" then
+                            bt = 0
+                        end
                       if (not bt or bt - tbt > rbTime) then
                         bt = tbt;
                       end
diff --git a/localization.en.lua b/localization.en.lua
index 49a28c0..dfcb381 100644
--- a/localization.en.lua
+++ b/localization.en.lua
@@ -6,13 +6,8 @@
 SMARTBUFF_WHATSNEW = "\n\n|cffffffff         Whats new:|r\n\n"
   .."          |cffffffffClassic version by Codermik, additional retail coding\n"
   .."          by Speedwaystar.\n\n\n"
-  .."          Changes in r49.290723:\n\n"
-  .."             * Fixed an issue with the camera zoom.\n\n"
-  .."             * Conjured items no longer prompt if moving.\n\n"
-  .."             * Added option to prompt while mounted and\n"
-  .."               to automatically dismount you to buff.\n\n"
-  .."             * Class buffs should now use the correct\n"
-  .."               ranks when casting on lower levels.\n"
+  .."          Changes in r50.310823:\n\n"
+  .."             * Fixed druid linked buff prompts.\n\n"
   .."\n\n"
   .."          |cffffff00I currently play on the Mirage Raceway EU classic\n"
   .."          WOTLK server as Alliance, I play on Mik, Gabella,\n"