diff --git a/src/strategy/values/AoeValues.cpp b/src/strategy/values/AoeValues.cpp
index 4675beb7..e6295349 100644
--- a/src/strategy/values/AoeValues.cpp
+++ b/src/strategy/values/AoeValues.cpp
@@ -123,7 +123,8 @@ Aura* AreaDebuffValue::Calculate()
     // Unit::AuraApplicationMap& map = bot->GetAppliedAuras();
     Unit::AuraEffectList const& aurasPeriodicDamage = bot->GetAuraEffectsByType(SPELL_AURA_PERIODIC_DAMAGE);
     Unit::AuraEffectList const& aurasPeriodicTriggerSpell = bot->GetAuraEffectsByType(SPELL_AURA_PERIODIC_TRIGGER_SPELL);
-    for (const Unit::AuraEffectList& list : {aurasPeriodicDamage, aurasPeriodicTriggerSpell}) {
+    Unit::AuraEffectList const& aurasPeriodicTriggerWithValueSpell = bot->GetAuraEffectsByType(SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
+    for (const Unit::AuraEffectList& list : {aurasPeriodicDamage, aurasPeriodicTriggerSpell, aurasPeriodicTriggerWithValueSpell}) {
         for (auto i = list.begin(); i != list.end(); ++i)
         {
             AuraEffect* aurEff = *i;
diff --git a/src/strategy/values/PossibleTargetsValue.cpp b/src/strategy/values/PossibleTargetsValue.cpp
index 904cfc01..a5365592 100644
--- a/src/strategy/values/PossibleTargetsValue.cpp
+++ b/src/strategy/values/PossibleTargetsValue.cpp
@@ -39,22 +39,25 @@ bool PossibleTriggersValue::AcceptUnit(Unit* unit)
     if (!unit->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE)) {
         return false;
     }
-    Unit::AuraEffectList const& auras = unit->GetAuraEffectsByType(SPELL_AURA_PERIODIC_TRIGGER_SPELL);
-	for (auto i = auras.begin(); i != auras.end(); ++i)
-	{
-        AuraEffect* aurEff = *i;
-        const SpellInfo* spellInfo = aurEff->GetSpellInfo();
-        if (!spellInfo)
-            continue;
-        const SpellInfo* triggerSpellInfo = sSpellMgr->GetSpellInfo(spellInfo->Effects[aurEff->GetEffIndex()].TriggerSpell);
-        if (!triggerSpellInfo)
-            continue;
-        for (int j = 0; j < MAX_SPELL_EFFECTS; j++) {
-            if (triggerSpellInfo->Effects[j].Effect == SPELL_EFFECT_SCHOOL_DAMAGE) {
-                return true;
+    Unit::AuraEffectList const& aurasPeriodicTriggerSpell = bot->GetAuraEffectsByType(SPELL_AURA_PERIODIC_TRIGGER_SPELL);
+    Unit::AuraEffectList const& aurasPeriodicTriggerWithValueSpell = bot->GetAuraEffectsByType(SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
+    for (const Unit::AuraEffectList& list : {aurasPeriodicTriggerSpell, aurasPeriodicTriggerWithValueSpell}) {
+        for (auto i = list.begin(); i != list.end(); ++i)
+        {
+            AuraEffect* aurEff = *i;
+            const SpellInfo* spellInfo = aurEff->GetSpellInfo();
+            if (!spellInfo)
+                continue;
+            const SpellInfo* triggerSpellInfo = sSpellMgr->GetSpellInfo(spellInfo->Effects[aurEff->GetEffIndex()].TriggerSpell);
+            if (!triggerSpellInfo)
+                continue;
+            for (int j = 0; j < MAX_SPELL_EFFECTS; j++) {
+                if (triggerSpellInfo->Effects[j].Effect == SPELL_EFFECT_SCHOOL_DAMAGE) {
+                    return true;
+                }
             }
         }
-	}
+    }
     return false;
     // return true; // AttackersValue::IsPossibleTarget(unit, bot, range);
 }