diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e4c365aa08..2f52301944 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e4c365aa08..2f52301944 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 76f3957286..7a92b99d7b 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 76f3957286..7a92b99d7b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 76f3957286..7a92b99d7b 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 76f3957286..7a92b99d7b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 76f3957286..7a92b99d7b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f842050266..00f7201f95 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 48bd4e1ca5..639549f051 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2250,7 +2250,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = new CreatureAI(new AIAccessor());
 				}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 0e17a28368..8d1fc0a1f8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2505,7 +2505,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 8a5d5e9960..4b6962973b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2507,7 +2507,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c0417c341a..fc9609776e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1748,7 +1748,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c0417c341a..fc9609776e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1748,7 +1748,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c0417c341a..fc9609776e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1748,7 +1748,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 2ddb69e672..e199d1b3bd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 2ddb69e672..e199d1b3bd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 7ebf2bb930..1dcc9c94ea 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1749,7 +1749,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c0417c341a..fc9609776e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1748,7 +1748,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			synchronized (this)
 			{
-				if (_ai == null)
+				ai = _ai;
+				if (ai == null)
 				{
 					_ai = ai = initAI();
 				}