diff --git a/src/main/java/de/steev/bm/BetterMinecraft.java b/src/main/java/de/steev/bm/BetterMinecraft.java
index 471d119..9ed647a 100644
--- a/src/main/java/de/steev/bm/BetterMinecraft.java
+++ b/src/main/java/de/steev/bm/BetterMinecraft.java
@@ -43,18 +43,11 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
 		// Registers Events
 		this.getLogger().info(prefix + ChatColor.WHITE + "Load Events");
 
-		try {
-			if(this.playerData.readBooleanFromConfig("improved_bed")) this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this);
-			if(this.playerData.readBooleanFromConfig("custom_drops")) this.getServer().getPluginManager().registerEvents(new KillListener(this.gameManager), this);
-			if(this.playerData.readBooleanFromConfig("replanting")) this.getServer().getPluginManager().registerEvents(new InteractListener(this.gameManager), this);
-			if(this.playerData.readBooleanFromConfig("anvil_fix")) this.getServer().getPluginManager().registerEvents(new PrepareAnvilListener(this.gameManager), this);
-			if(this.playerData.readBooleanFromConfig("back_command")) this.getServer().getPluginManager().registerEvents(this, this);
-
-		} catch (ConfigEntryExceptions e) {
-			throw new RuntimeException(e);
-		}
-
-
+		this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this);
+		this.getServer().getPluginManager().registerEvents(new KillListener(this.gameManager), this);
+		this.getServer().getPluginManager().registerEvents(new InteractListener(this.gameManager), this);
+		this.getServer().getPluginManager().registerEvents(new PrepareAnvilListener(this.gameManager), this);
+		this.getServer().getPluginManager().registerEvents(this, this);
 		Objects.requireNonNull(this.getCommand("back")).setExecutor(new back(this.gameManager));
 
 		// PlayerData
diff --git a/src/main/java/de/steev/bm/Listener/PrepareAnvilListener.java b/src/main/java/de/steev/bm/Listener/PrepareAnvilListener.java
index 165ae3c..9edbbc6 100644
--- a/src/main/java/de/steev/bm/Listener/PrepareAnvilListener.java
+++ b/src/main/java/de/steev/bm/Listener/PrepareAnvilListener.java
@@ -21,7 +21,12 @@ public class PrepareAnvilListener implements Listener {
 
     @EventHandler
     public void onPrepare(PrepareAnvilEvent event) {
-        AnvilView inv = event.getView();
-        inv.setMaximumRepairCost(Integer.MAX_VALUE); // TODO: find solution for deprecation
+        if (this.gameManager.getConfigManager().GetBool("anvil_fix")) {
+            AnvilView inv = event.getView();
+            this.gameManager.getPlugin().getLogger().info(prefix + "repaircost:" + inv.getRepairCost());
+            inv.setMaximumRepairCost(Integer.MAX_VALUE);
+            inv.getPlayer().sendMessage("repair cost: " + inv.getRepairCost());
+            inv.setRepairCost(inv.getRepairCost());
+        }
     }
 }