diff --git a/build.gradle b/build.gradle
index ca28f62..11227a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.12.2-2.12"
+version = "1.12.2-2.13"
 group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "effortlessbuilding"
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
index ff8b754..b356e97 100644
--- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
+++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
@@ -39,7 +39,7 @@ public class EffortlessBuilding
 {
     public static final String MODID = "effortlessbuilding";
     public static final String NAME = "Effortless Building";
-    public static final String VERSION = "1.12.2-2.12";
+    public static final String VERSION = "1.12.2-2.13";
 
     @Mod.Instance(EffortlessBuilding.MODID)
     public static EffortlessBuilding instance;
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java
index 0c49965..2c557de 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java
@@ -122,11 +122,6 @@ public class BuildModes {
     //Use a network message to break blocks in the distance using clientside mouse input
     public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
         BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
-
-        //Early out if cant break far, coming from own mouse event (not block broken event)
-        //To make breaking blocks in survival possible without breaking instantly
-        if (!ReachHelper.canBreakFar(player)) return;
-
         onBlockBroken(player, startPos, true);
     }
 
@@ -149,10 +144,6 @@ public class BuildModes {
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
-        //Early out if cant break far and (if in normal mode) no modifier is enabled
-        //So either cant break far and you are not in normal mode or cant break far and you are in normal mode, but no modifier is enabled
-//        if (!ReachHelper.canBreakFar(player) && (breakStartPos || !BuildModifiers.isEnabled(modifierSettings, startPos))) return;
-
         //Get coordinates
         BuildModeEnum buildMode = modeSettings.getBuildMode();
         List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, EnumFacing.UP, Vec3d.ZERO, true);
diff --git a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java
index e4d488e..0924b65 100644
--- a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java
+++ b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java
@@ -261,6 +261,11 @@ public class ClientProxy implements IProxy {
             //Break block in distance in creative (or survival if enabled in config)
             if (breakCooldown <= 0) {
                 breakCooldown = 4;
+
+                //Early out if cant break far, coming from own mouse event (not block broken event)
+                //To make breaking blocks in survival possible without breaking instantly
+                if (!ReachHelper.canBreakFar(player)) return;
+
                 RayTraceResult lookingAt = getLookingAt(player);
 
                 BuildModes.onBlockBrokenMessage(player, lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));