diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
index efcb4a43b4..9a4b06e276 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java
@@ -62,7 +62,7 @@ public class Range implements IAffectScopeHandler
 			{
 				return false;
 			}
-			if ((affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
+			if ((c != target) && (affectObject != null) && !affectObject.checkAffectedObject(activeChar, c))
 			{
 				return false;
 			}