diff --git a/src/main/java/land/battle/practice/listeners/MatchListener.java b/src/main/java/land/battle/practice/listeners/MatchListener.java
index 152975d..6163eab 100644
--- a/src/main/java/land/battle/practice/listeners/MatchListener.java
+++ b/src/main/java/land/battle/practice/listeners/MatchListener.java
@@ -128,19 +128,24 @@ public class MatchListener implements Listener {
 
     @EventHandler
     public void onEntityDamage(EntityDamageByEntityEvent event) {
+
         if (event.getEntity() instanceof Player && event.getDamager() instanceof Player) {
             Player defender = (Player) event.getEntity();
+            final Player player = (Player) event.getEntity();
+            final PlayerData playerData = this.plugin.getPlayerManager().getPlayerData(player.getUniqueId());
 
                 if (defender.isBlocking() && defender.getInventory().getItemInHand().getType().toString().contains("SWORD")) {
                     new BukkitRunnable() {
                         @Override
                         public void run() {
-                            if (defender.isBlocking() && counter >= 20) {
+                            if (playerData.getPlayerState() == PlayerState.FIGHTING) {
+                                if (defender.isBlocking() && counter >= 20) {
                                 defender.setHealth(defender.getHealth() - 1.0);
                                 cancel();
                             } else if (defender.isBlocking()) {
-                                counter++;
+                                 counter++;
                             }
+                          }
                         }
                     }.runTaskAsynchronously(Practice.getInstance());
                 }
@@ -258,7 +263,7 @@ public class MatchListener implements Listener {
         }
 
         match.broadcast(CC.GRAY + " ");
-        match.broadcast(Color.MAIN_COLOR + "Match Overview" + CC.GRAY + " (click to view inventories)");
+        match.broadcast(Color.MAIN_COLOR + "Match Overview" + CC.GRAY + CC.ITALIC + " (click to view inventories)");
 
         final ChatComponentBuilder wInventories = new ChatComponentBuilder("");
         final ChatComponentBuilder lInventories = new ChatComponentBuilder("");