diff --git a/game/modules/tome/data/talents/techniques/bloodthirst.lua b/game/modules/tome/data/talents/techniques/bloodthirst.lua
index 119426c66a021480308af89ccb9a688d515ef84a..aebfb687f3d3771150ba4e612d381b729ed1bd1a 100644
--- a/game/modules/tome/data/talents/techniques/bloodthirst.lua
+++ b/game/modules/tome/data/talents/techniques/bloodthirst.lua
@@ -98,9 +98,10 @@ newTalent{
 	points = 5,
 	cooldown = 45,
 	stamina = 120,
+	fixed_cooldown = true,
 	tactical = { DEFEND = 5, CLOSEIN = 2 },
 	getHealPercent = function(self,t) return self:combatTalentLimit(t, 50, 3.5, 17.5) end, -- Limit <50%
-	getDuration = function(self, t) return math.floor(self:combatTalentLimit(t, 25, 3, 7, true)) end, -- Limit < 25
+	getDuration = function(self, t) return math.floor(self:combatTalentLimit(t, 15, 3, 7, true)) end, -- Limit < 25
 	action = function(self, t)
 		self:setEffect(self.EFF_UNSTOPPABLE, t.getDuration(self, t), {hp_per_kill=t.getHealPercent(self,t)})
 		return true
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index e56ed2a05352bc2d3057394433a1bc468eeaf626..7a009247dc76989d1750691e6655bbc8f252bf5a 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -1874,26 +1874,6 @@ newEffect{
 	end,
 }
 
-newEffect{
-	name = "UNSTOPPABLE", image = "talents/unstoppable.png",
-	desc = "Unstoppable",
-	long_desc = function(self, eff) return ("The target is unstoppable! It refuses to die, and at the end it will heal %d Life."):format(eff.kills * eff.hp_per_kill * self.max_life / 100) end,
-	type = "mental",
-	subtype = { frenzy=true },
-	status = "beneficial",
-	parameters = { hp_per_kill=2 },
-	activate = function(self, eff)
-		eff.kills = 0
-		eff.tmpid = self:addTemporaryValue("unstoppable", 1)
-		eff.healid = self:addTemporaryValue("no_life_regen", 1)
-	end,
-	deactivate = function(self, eff)
-		self:removeTemporaryValue("unstoppable", eff.tmpid)
-		self:removeTemporaryValue("no_life_regen", eff.healid)
-		self:heal(eff.kills * eff.hp_per_kill * self.max_life / 100, eff)
-	end,
-}
-
 newEffect{
 	name = "INCREASED_LIFE", image = "effects/increased_life.png",
 	desc = "Increased Life",
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index 60aedc0f7e17783b6102de187ad5ac74e43672da..3e907dfb98eaacfeab4fc00ae8d5e4c4bc12ea6b 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -2680,3 +2680,23 @@ newEffect{
 		end
 	end,
 }
+
+newEffect{
+	name = "UNSTOPPABLE", image = "talents/unstoppable.png",
+	desc = "Unstoppable",
+	long_desc = function(self, eff) return ("The target is unstoppable! It refuses to die, and at the end it will heal %d Life."):format(eff.kills * eff.hp_per_kill * self.max_life / 100) end,
+	type = "other",
+	subtype = { frenzy=true },
+	status = "beneficial",
+	parameters = { hp_per_kill=2 },
+	activate = function(self, eff)
+		eff.kills = 0
+		eff.tmpid = self:addTemporaryValue("unstoppable", 1)
+		eff.healid = self:addTemporaryValue("no_life_regen", 1)
+	end,
+	deactivate = function(self, eff)
+		self:removeTemporaryValue("unstoppable", eff.tmpid)
+		self:removeTemporaryValue("no_life_regen", eff.healid)
+		self:heal(eff.kills * eff.hp_per_kill * self.max_life / 100, eff)
+	end,
+}