diff --git a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
index 5620975..c6e7286 100644
--- a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
+++ b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
@@ -405,7 +405,7 @@ object ConfigOptions {
             return maxBeforeMergeDisabled("sweeping")
         }
 
-        return DEFAULT_MAX_BEFORE_MERGE_DISABLED
+        return value
     }
 
 }
diff --git a/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt b/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
index 645a8b4..2cde74c 100644
--- a/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
+++ b/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
@@ -78,7 +78,7 @@ object EnchantmentUtil {
                 else {
                     // We test if it is allowed to merge at this level
                     val maxBeforeDisabled = ConfigOptions.maxBeforeMergeDisabled(enchantment)
-                    if((maxBeforeDisabled != -1) && (oldLevel >= maxBeforeDisabled)) return@forEach
+                    if((maxBeforeDisabled > 0) && (oldLevel >= maxBeforeDisabled)) return@forEach
 
                     // Now we increase the enchantment level by 1
                     var newLevel = oldLevel + 1