diff --git a/config.lua b/config.lua
index dde675a..7656cf0 100644
--- a/config.lua
+++ b/config.lua
@@ -34,11 +34,9 @@ setting("bool", "obsidian_lining", true, "Add an obsidian lining to magma condui
 setting("bool", "ameliorate_floods", true, "Ameliorate lava floods on the surface")
 
 -- Removing this setting on account of issue https://github.com/minetest/minetest/issues/7364
---setting("int", "upper_limit", 512, "Upper extent of magma conduits")
---setting("int", "lower_limit", -31000, "Lower extent of magma conduits")
---from settingtypes.txt:
---magma_conduits_upper_limit (Upper extent of magma conduits) int 512
---magma_conduits_lower_limit (Lower extent of magma conduits) int -31000
+-- Fixed with commit https://github.com/minetest/minetest/commit/5c1edc58ab2abe8bc1f1bbcbb2f30a5899586968
+setting("int", "upper_limit", 31000, "Upper extent of magma conduits")
+setting("int", "lower_limit", -31000, "Lower extent of magma conduits")
 
 setting("bool", "volcanoes", true, "Enable volcanoes")
 setting("int", "volcano_min_height", 20, "Minimum volcano peak")
diff --git a/magma_veins.lua b/magma_veins.lua
index e959fa6..e5f1fc0 100644
--- a/magma_veins.lua
+++ b/magma_veins.lua
@@ -1,6 +1,6 @@
 -- Hard-coding on account of issue https://github.com/minetest/minetest/issues/7364
-local height_min = -31000 -- magma_conduits.config.lower_limit
-local height_max = 31000 --magma_conduits.config.upper_limit
+local height_min = magma_conduits.config.lower_limit
+local height_max = magma_conduits.config.upper_limit
 
 minetest.register_ore({
 	ore_type = "vein",
diff --git a/settingtypes.txt b/settingtypes.txt
index bbb0bf6..ff25732 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -13,6 +13,11 @@ magma_conduits_remove_lava_above (Remove any lava above this y level) int 512
 #surrounding terrain
 magma_conduits_ameliorate_floods (Ameliorate lava floods on the surface) bool true
 
+# Note: Setting limits near "0" in versions of Minetest before June 2018
+# commit 5c1edc5 may cause a crash due to a bug in vein ore generation
+magma_conduits_upper_limit (Upper extent of magma conduits) int 31000
+magma_conduits_lower_limit (Lower extent of magma conduits) int -31000
+
 [Volcanoes]
 #If this is false none of the other settings in this section apply
 magma_conduits_volcanoes (Enable volcanoes) bool true
@@ -35,4 +40,4 @@ magma_conduits_volcano_magma_chambers (Enables magma chambers at base of pipes)
 
 magma_conduits_volcano_probability_active (Probability of active volcano in region) float 0.4
 magma_conduits_volcano_probability_dormant (Probability of dormant volcano in region) float 0.2
-magma_conduits_volcano_probability_extinct (Probability of extinct volcano in region) float 0.2
+magma_conduits_volcano_probability_extinct (Probability of extinct volcano in region) float 0.2
\ No newline at end of file