diff --git a/BlueWater/Assets/02.Scripts/Ai/AiController.cs b/BlueWater/Assets/02.Scripts/Ai/AiController.cs
index 5f83f5ba0..4d9c45e91 100644
--- a/BlueWater/Assets/02.Scripts/Ai/AiController.cs
+++ b/BlueWater/Assets/02.Scripts/Ai/AiController.cs
@@ -62,10 +62,12 @@ namespace BlueWaterProject
         
         #region Unity built-in function
 
+#if UNITY_EDITOR
         private void OnDrawGizmosSelected()
         {
             DrawGizmosInFieldOfView();
         }
+#endif
 
         protected virtual void Awake()
         {
@@ -197,8 +199,7 @@ namespace BlueWaterProject
         [field: SerializeField] public TargetInfo TargetInfo { get; set; } = new();
 
         private const int TARGET_MAX_SIZE = 30;
-
-#if UNITY_EDITOR
+        
         public void DrawGizmosInFieldOfView()
         {
             if (!IsDrawGizmosInFieldOfView) return;
@@ -212,7 +213,6 @@ namespace BlueWaterProject
             
             Debug.DrawLine(myPos, TargetInfo.transform.position, Color.red);
         }
-#endif
 
         public IEnumerator FindTarget()
         {
diff --git a/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs b/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs
index 8c79556a7..5d8411759 100644
--- a/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs
+++ b/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs
@@ -129,7 +129,7 @@ namespace BlueWaterProject
                 var soldierObject = Instantiate(soliderPrefabList[(int)unit.unitType - 1], spawnPosition, Quaternion.identity, unitController.transform).GetComponent<AiController>();
                 
                 objectNameBuilder.Clear();
-                objectNameBuilder.Append(soliderPrefabList[(int)unit.unitType].name);
+                objectNameBuilder.Append(soliderPrefabList[(int)unit.unitType - 1].name);
                 objectNameBuilder.Append("_");
                 objectNameBuilder.AppendFormat("{0:00}", i + 1);