diff --git a/zone/npc.cpp b/zone/npc.cpp
index 0cc2580fe..b7dc3272a 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -962,7 +962,7 @@ void NPC::Depop(bool StartSpawnTimer) {
 }
 
 bool NPC::DatabaseCastAccepted(int spell_id) {
-	for (int i=0; i < 12; i++) {
+	for (int i=0; i < EFFECT_COUNT; i++) {
 		switch(spells[spell_id].effectid[i]) {
 		case SE_Stamina: {
 			if(IsEngaged() && GetHPRatio() < 100)
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index cad4e1df8..1dfbeb4a2 100755
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -3703,7 +3703,7 @@ void ZoneDatabase::LoadBuffs(Client *client)
 		if (!IsValidSpell(buffs[index].spellid))
 			continue;
 
-		for (int effectIndex = 0; effectIndex < 12; ++effectIndex) {
+		for (int effectIndex = 0; effectIndex < EFFECT_COUNT; ++effectIndex) {
 
 			if (spells[buffs[index].spellid].effectid[effectIndex] == SE_Charm) {
 				buffs[index].spellid = SPELL_UNKNOWN;