diff --git a/changelog.txt b/changelog.txt
index 9f471fd00..fe9e68c29 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 10/03/2013 ==
+demonstar55: Fix when the random +1 tick is added to nerf extension focus effects to where they should be
+
 == 09/30/2013 ==
 Sorvani: Changed SummonItem to only summon an item with max charges when said default value is present and not on zero charges
 demonstar55: Fixed issue with #showstats showing your level for a bunch of values
diff --git a/zone/effects.cpp b/zone/effects.cpp
index ce534d667..73f1f8e64 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -414,6 +414,14 @@ int32 Client::GetActSpellDuration(uint16 spell_id, int32 duration)
 	if(IsMezSpell(spell_id)) {
 		tic_inc += GetAA(aaMesmerizationMastery);
 	}
+	// Only need this for clients, since the change was for bard songs, I assume we should keep non bard songs getting +1
+	// However if its bard or not and is mez, charm or fear, we need to add 1 so that client is in sync
+	if(!IsShortDurationBuff(spell_id) ||
+		IsFearSpell(spell_id) ||
+		IsCharmSpell(spell_id) ||
+		IsMezSpell(spell_id) ||
+		IsBlindSpell(spell_id))
+		tic_inc += 1;
 
 	return (((duration * increase) / 100) + tic_inc);
 }
diff --git a/zone/spells.cpp b/zone/spells.cpp
index fb400032a..f40f96912 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -2364,14 +2364,6 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste
 		castlevel = caster_level_override;
 
 	int res = CalcBuffDuration_formula(castlevel, formula, duration);
-	// Only need this for clients, since the change was for bard songs, I assume we should keep non bard songs getting +1
-	// However if its bard or not and is mez, charm or fear, we need to add 1 so that client is in sync
-	if(!IsShortDurationBuff(spell_id) ||
-		IsFearSpell(spell_id) ||
-		IsCharmSpell(spell_id) ||
-		IsMezSpell(spell_id) ||
-		IsBlindSpell(spell_id))
-		res += 1;
 	
 	res = mod_buff_duration(res, caster, target, spell_id);