diff --git a/Assets/Scripts/Unit.cs b/Assets/Scripts/Unit.cs
index a9ef57f..f4fdb3f 100644
--- a/Assets/Scripts/Unit.cs
+++ b/Assets/Scripts/Unit.cs
@@ -196,6 +196,7 @@ public class Unit : MonoBehaviour
                             else
                             {
                                 // Can't move to cell this is standed by enemy.
+                                destinationCell = standingCell;
                                 break;
                             }
                         }
@@ -273,7 +274,7 @@ public class Unit : MonoBehaviour
 
         for (int i = 0; i < unitsInRange.Count; i++)
         {
-            Debug.Log(unitsInRange[i].unitName + ": " + unitsInRange[i].standingCell.xPos + " , " + unitsInRange[i].standingCell.yPos);
+            //Debug.Log(unitsInRange[i].unitName + ": " + unitsInRange[i].standingCell.xPos + " , " + unitsInRange[i].standingCell.yPos);
             // Do attack
             //Debug.Log("Attack!");
             unitsInRange[i].currentDefense -= finalAttack;
diff --git a/Assets/Scripts/UnitManager.cs b/Assets/Scripts/UnitManager.cs
index 2a3fdfa..c0f3258 100644
--- a/Assets/Scripts/UnitManager.cs
+++ b/Assets/Scripts/UnitManager.cs
@@ -55,7 +55,10 @@ public class UnitManager : MonoBehaviour
                 {
                     unit.MoveAction();
                 }
+            }
 
+            foreach (var unit in rightSideUnits)
+            {
                 if (unit.isUnitAlive())
                 {
                     unit.AttackAction();
@@ -71,7 +74,10 @@ public class UnitManager : MonoBehaviour
                 {
                     unit.MoveAction();
                 }
+            }
 
+            foreach (var unit in leftSideUnits)
+            {
                 if (unit.isUnitAlive())
                 {
                     unit.AttackAction();
@@ -87,10 +93,10 @@ public class UnitManager : MonoBehaviour
         switch (side)
         {
             case Side.left:
-                leftSideUnits = leftSideUnits.OrderByDescending(x => x.standingCell.xPos).ThenByDescending(y => y.standingCell.yPos).ToList<Unit>();
+                leftSideUnits = leftSideUnits.OrderByDescending(x => x.standingCell.xPos).ThenBy(y => y.standingCell.yPos).ToList<Unit>();
                 break;
             case Side.right:
-                rightSideUnits = rightSideUnits.OrderBy(x => x.standingCell.xPos).ThenBy(y => y.standingCell.yPos).ToList<Unit>();
+                rightSideUnits = rightSideUnits.OrderBy(x => x.standingCell.xPos).ThenByDescending(y => y.standingCell.yPos).ToList<Unit>();
                 break;
             default:
                 break;