diff --git a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
index eb7e9b1d..6250ddde 100644
--- a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
+++ b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
@@ -82,7 +82,7 @@ UTIL_LOAD_ERROR=§cThe schematic could not be loaded
 UTIL_DOWNLOAD_PUNISHED=§cYou are not allowed to download schematics: §f§l{0}
 UTIL_DOWNLOAD_NOT_OWN=§cYou may download only your own schematics
 UTIL_DOWNLOAD_LINK=Your download link:
-UTIL_TYPE_PUNISHED=§cYou are not allowed to submit schematics until §e{0}§7: §f§l{1}
+UTIL_TYPE_PUNISHED=§cYou are not allowed to submit schematics until §e{1}§7: §f§l{0}
 UTIL_TYPE_PUNISHED_PERMA=§cYou are permanently prohibited from submitting schematics: §f§l{0}
 UTIL_TYPE_NOT_OWN=§cYou can only submit your own schematics
 UTIL_TYPE_DIR=§cYou cannot submit folders
diff --git a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
index f52763a9..6660f686 100644
--- a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
+++ b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
@@ -69,7 +69,7 @@ UTIL_LOAD_ERROR=§cDie Schematic konnte nicht geladen werden
 UTIL_DOWNLOAD_PUNISHED=§cDu darf keine Schematics Downloaden: §f§l{0}
 UTIL_DOWNLOAD_NOT_OWN=§cDu darfst nur deine eigenen Schematics herunterladen
 UTIL_DOWNLOAD_LINK=Dein Download Link:
-UTIL_TYPE_PUNISHED=§cDu darfst bis zum §e{0} §7keine Schematics einsenden: §f§l{1}
+UTIL_TYPE_PUNISHED=§cDu darfst bis zum §e{1} §7keine Schematics einsenden: §f§l{0}
 UTIL_TYPE_PUNISHED_PERMA=§cDu darfst keine Schematics mehr einsenden: §f§l{0}
 UTIL_TYPE_NOT_OWN=§cDu kannst nur deine eigenen Schematics einsenden
 UTIL_TYPE_DIR=§cDu kannst keine Ordner einsenden
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
index ba48a78f..60d33ad5 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
@@ -427,13 +427,7 @@ public class SchematicCommandUtils {
         } else if (type.fightType()) {
             if (Punishment.isPunished(user,
                     Punishment.PunishmentType.NoSchemSubmitting,
-                    punishment -> {
-                        if (punishment.isPerma()) {
-                            SchematicSystem.MESSAGE.send("UTIL_TYPE_PUNISHED_PERMA", player, punishment.getReason());
-                        } else {
-                            SchematicSystem.MESSAGE.send("UTIL_TYPE_PUNISHED", player, punishment.getEndTime(), punishment.getReason());
-                        }
-                    })) {
+                    punishment -> SchematicSystem.MESSAGE.send(punishment.isPerma() ? "UTIL_TYPE_PUNISHED_PERMA" : "UTIL_TYPE_PUNISHED", player, punishment.getReason(), punishment.getEndTime()))) {
                 return;
             }