diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs
index 4af4fe5..aac336b 100644
--- a/Assets/GWConquest/Scripts/Formation.cs
+++ b/Assets/GWConquest/Scripts/Formation.cs
@@ -69,9 +69,9 @@ namespace GWConquest
 
         public EntityList SubFormationEntities;
 
-        public Unit[] Units
+        public IEnumerable<Unit> Units
         {
-            get => Array.ConvertAll(UnitEntities.ToArray(), e => e.GetComponent<Unit>());
+            get => UnitEntities.Select((e,i) => e.GetComponent<Unit>());
         }
 
         public Unit HeroUnit
diff --git a/Assets/GWConquest/Scripts/UI/FleetIcons.cs b/Assets/GWConquest/Scripts/UI/FleetIcons.cs
index e4a3fb5..463f56a 100644
--- a/Assets/GWConquest/Scripts/UI/FleetIcons.cs
+++ b/Assets/GWConquest/Scripts/UI/FleetIcons.cs
@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEngine.UI;
+using System.Linq;
 
 namespace GWConquest
 {
@@ -19,8 +20,8 @@ namespace GWConquest
         {
             formation = f;
 
-            var units = f.Units;
-            int iconCount = Mathf.Min(units.Length, MaxIcons);
+            var units = f.Units.ToList();
+            int iconCount = Mathf.Min(units.Count, MaxIcons);
 
             if(iconCount > 0)
             {