diff --git a/src/main/java/bitFight/Main.java b/src/main/java/bitFight/Main.java
index bff4507c41078382791de978bcdd7384b2c9a5c4..ea97d2f42c43ee5a8db62a4ed7958e33caaadfb7 100644
--- a/src/main/java/bitFight/Main.java
+++ b/src/main/java/bitFight/Main.java
@@ -110,11 +110,13 @@ class Main {
                     ActionType type = null;
                     for(Action a : actionList) if(a.getName().equals(input.getInput())) type = a.getActionType();
                     if(type == ActionType.ATTACK) {
-                        Attack attack = (Attack) actionList.get(actionList.indexOf(input.getInput()));
+                        Attack attack = Attack.PUNCH;
+                        for(Action a : actionList) if(a.getName().equals(input.getInput())) attack = (Attack) a;
                         level.playerHasEnergy(attack);
                     } else
                     if(type == ActionType.DEFENSE) {
-                        Defense defense = (Defense) actionList.get(actionList.indexOf(input.getInput()));
+                        Defense defense = Defense.HIGHBLOCK;
+                        for(Action a : actionList) if(a.getName().equals(input.getInput())) defense = (Defense) a;
                         Attack randomEnemyAttack = Attack.values()[(int) rand.nextDouble()*Attack.values().length];
                         level.defends(player, defense, randomEnemyAttack);
                     }