diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
deleted file mode 100644
index 3058d5135..000000000
--- a/.github/workflows/labeler.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: "Pull Request Labeler"
-on: [pull_request_target]
-
-jobs:
-  triage:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/labeler@main
-      with:
-        repo-token: ${{ secrets.AC_GITHUB_TOKEN }}
-        configuration-path: .github/labeler.yml
-        sync-labels: true
diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml
new file mode 100644
index 000000000..7cffffe6b
--- /dev/null
+++ b/.github/workflows/pr_labeler.yml
@@ -0,0 +1,17 @@
+name: Pull Request Labeler
+on:
+  - pull_request_target
+
+jobs:
+  triage:
+    runs-on: ubuntu-20.04
+    steps:
+      # This delay is necessary to correctly trigger builds on label application
+      - name: Sleep for 30 seconds
+        run: sleep 30s
+        shell: bash
+      - uses: actions/labeler@v3
+        with:
+          repo-token: ${{ secrets.AC_GITHUB_TOKEN }}
+          configuration-path: .github/labeler.yml
+          sync-labels: true
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index bbf1577d4..3cbe852dd 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1171,14 +1171,16 @@ void Spell::SelectImplicitNearbyTargets(SpellEffIndex effIndex, SpellImplicitTar
     {
         case TARGET_OBJECT_TYPE_UNIT:
             {
-                if (Unit* unitTarget = target->ToUnit())
+                if (Unit* unit = target->ToUnit())
                 {
-                    AddUnitTarget(unitTarget, effMask, true, false);
+                    AddUnitTarget(unit, effMask, true, false);
                     // xinef: important! if channeling spell have nearby entry, it has no unitTarget by default
                     // and if channeled spell has target 77, it requires unitTarget, set it here!
                     // xinef: if we have NO unit target
                     if (!m_targets.GetUnitTarget())
-                        m_targets.SetUnitTarget(unitTarget);
+                    {
+                        m_targets.SetUnitTarget(unit);
+                    }
                 }
                 else
                 {