diff --git a/src/main/java/de/fanta/challenges/challenges/BedrockWallChallenge.java b/src/main/java/de/fanta/challenges/challenges/BedrockWallChallenge.java
index 970003b..bfefd0e 100644
--- a/src/main/java/de/fanta/challenges/challenges/BedrockWallChallenge.java
+++ b/src/main/java/de/fanta/challenges/challenges/BedrockWallChallenge.java
@@ -18,7 +18,7 @@
     @EventHandler
     public void onMove(PlayerMoveEvent e) {
         Player p = e.getPlayer();
-        if (plugin.getConfig().getBoolean("bedrockwall") && plugin.getTimer().isRunning()) {
+        if (plugin.getConfig().getBoolean("bedrockwall") && plugin.getTimer().isRunning() && !plugin.getVanish().isVanish(e.getPlayer())) {
             if (!e.getTo().equals(e.getFrom())) {
                 Location loc = p.getLocation();
                 setWall(loc);
@@ -30,10 +30,8 @@
     private void setWall(Location loc) {
         Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
             World world = loc.getWorld();
-            int maxHeight = world.getMaxHeight();
-            int minHeight = world.getMinHeight();
-            for (int y = minHeight; y < maxHeight; y++) {
-                Block block = loc.clone().add(loc.getX(), y, loc.getZ()).getBlock();
+            for (int y = world.getMinHeight(); y < world.getMaxHeight(); y++) {
+                Block block = loc.set(loc.getX(), y, loc.getZ()).getBlock();
                 block.setType(Material.BEDROCK);
             }
         }, 20 * 10L);