diff --git a/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java b/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java
index 0d49214..10001c3 100644
--- a/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java
+++ b/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java
@@ -16,7 +16,7 @@ public class KnockdownsUtils {
                 continue;
             }
             IKnockableDown knockable = (IKnockableDown) teammate;
-            if (!knockable.is_KnockedDown() && !player.isDead()) {
+            if (!knockable.is_KnockedDown() && !teammate.isDead()) {
                 return false;
             }
         }
diff --git a/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java b/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java
index 48096a1..2067ce9 100644
--- a/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java
+++ b/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java
@@ -70,13 +70,12 @@ public class KnockdownsEvents {
             KnockdownsNetwork.sendToWorld(player.getWorld(), new PlayKnockedDownSoundS2CPacket(player.getX(), player.getY(), player.getZ()));
 
             Text deathMessage = entity.getDamageTracker().getDeathMessage();
-            TranslatableTextContent content = (TranslatableTextContent) deathMessage.getContent();
-            Text replaced = Text.translatable(content.getKey().replace("death.", "knockdown."), content.getArgs());
-            if (replaced.getString().equals(content.getKey())) {
-                replaced = deathMessage;
-            }
+            TranslatableTextContent deathContent = (TranslatableTextContent) deathMessage.getContent();
 
-            server.getPlayerManager().broadcast(replaced, false);
+            String knockdownKey = deathContent.getKey().replace("death.", "knockdown.");
+            Text knockdownMessage = Text.translatable(knockdownKey, deathContent.getArgs());
+
+            server.getPlayerManager().broadcast(!knockdownMessage.getString().equals(knockdownKey) ? knockdownMessage : deathMessage, false);
 
             return EventResult.interruptFalse();
         });
diff --git a/gradle.properties b/gradle.properties
index af16451..892055c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.2
 enabled_platforms=fabric,forge
 
 archives_base_name=knockdowns
-mod_version=2.1.0
+mod_version=2.1.1
 maven_group=ru.octol1ttle.knockdowns
 
 architectury_version=6.5.85