diff --git a/mods/ENTITIES/mobs_mc/axolotl.lua b/mods/ENTITIES/mobs_mc/axolotl.lua
index 10a88a537..e7ecb17c0 100644
--- a/mods/ENTITIES/mobs_mc/axolotl.lua
+++ b/mods/ENTITIES/mobs_mc/axolotl.lua
@@ -94,8 +94,6 @@ local axolotl = {
 
 mcl_mobs.register_mob("mobs_mc:axolotl", axolotl)
 
-local water = 0
-
 mcl_mobs:spawn_setup({
 	name = "mobs_mc:axolotl",
 	dimension = "overworld",
diff --git a/mods/ENTITIES/mobs_mc/cod.lua b/mods/ENTITIES/mobs_mc/cod.lua
index dea7bf155..57c0ad8a7 100644
--- a/mods/ENTITIES/mobs_mc/cod.lua
+++ b/mods/ENTITIES/mobs_mc/cod.lua
@@ -117,8 +117,6 @@ mcl_mobs.register_mob("mobs_mc:cod", cod)
 
 --spawning TODO: in schools
 
-local water = 0
-
 mcl_mobs:spawn_setup({
 	name = "mobs_mc:cod",
 	dimension = "overworld",
@@ -269,8 +267,8 @@ mcl_mobs:spawn_setup({
 	chance = 750,
 	interval = 30,
 	aoc = 3,
-	min_height = water-16,
-	max_height = water+1
+	min_height = mobs_mc.water_level - 16,
+	max_height = mobs_mc.water_level + 1
 })
 
 --spawn egg
diff --git a/mods/ENTITIES/mobs_mc/dolphin.lua b/mods/ENTITIES/mobs_mc/dolphin.lua
index c39059705..b49cf0d25 100644
--- a/mods/ENTITIES/mobs_mc/dolphin.lua
+++ b/mods/ENTITIES/mobs_mc/dolphin.lua
@@ -97,7 +97,6 @@ mcl_mobs.register_mob("mobs_mc:dolphin", dolphin)
 
 
 --spawning TO DO: in schools
-local water = 0
 mcl_mobs:spawn_setup({
 	name = "mobs_mc:dolphin",
 	dimension = "overworld",
@@ -247,8 +246,8 @@ mcl_mobs:spawn_setup({
 	chance = 70,
 	interval = 30,
 	aoc = 3,
-	min_height = water-16,
-	max_height = water+1
+	min_height = mobs_mc.water_level - 16,
+	max_height = mobs_mc.water_level + 1
 })
 
 --spawn egg
diff --git a/mods/ENTITIES/mobs_mc/glow_squid.lua b/mods/ENTITIES/mobs_mc/glow_squid.lua
index 8755d9fcb..145e1a972 100644
--- a/mods/ENTITIES/mobs_mc/glow_squid.lua
+++ b/mods/ENTITIES/mobs_mc/glow_squid.lua
@@ -88,7 +88,6 @@ mcl_mobs.register_mob("mobs_mc:glow_squid", {
 })
 
 -- spawning
-local water = mobs_mc.water_level - 1
 mcl_mobs:spawn_setup({
 	name = "mobs_mc:glow_squid",
 	dimension = "overworld",
@@ -239,8 +238,8 @@ mcl_mobs:spawn_setup({
 	chance = 100,
 	interval = 30,
 	aoc = 3,
-	min_height = water - 16,
-	max_height = water
+	min_height = mobs_mc.water_level - 17,
+	max_height = mobs_mc.water_level - 1
 })
 
 -- spawn egg
diff --git a/mods/ENTITIES/mobs_mc/salmon.lua b/mods/ENTITIES/mobs_mc/salmon.lua
index d01946b8e..e6c35e123 100644
--- a/mods/ENTITIES/mobs_mc/salmon.lua
+++ b/mods/ENTITIES/mobs_mc/salmon.lua
@@ -72,7 +72,6 @@ mcl_mobs.register_mob("mobs_mc:salmon", salmon)
 
 
 --spawning TODO: in schools
-local water = 0
 mcl_mobs:spawn_setup({
 	name = "mobs_mc:salmon",
 	dimension = "overworld",
@@ -223,8 +222,8 @@ mcl_mobs:spawn_setup({
 	chance = 260,
 	interval = 30,
 	aoc = 3,
-	min_height = water-16,
-	max_height = water+1
+	min_height = mobs_mc.water_level - 16,
+	max_height = mobs_mc.water_level + 1
 })
 
 --spawn egg
diff --git a/mods/ENTITIES/mobs_mc/tropical_fish.lua b/mods/ENTITIES/mobs_mc/tropical_fish.lua
index a9af96b78..0d229265b 100644
--- a/mods/ENTITIES/mobs_mc/tropical_fish.lua
+++ b/mods/ENTITIES/mobs_mc/tropical_fish.lua
@@ -121,7 +121,6 @@ local tropical_fish = {
 
 mcl_mobs.register_mob("mobs_mc:tropical_fish", tropical_fish)
 
-local water = 0
 mcl_mobs:spawn_setup({
 	name = "mobs_mc:tropical_fish",
 	dimension = "overworld",
@@ -186,8 +185,8 @@ mcl_mobs:spawn_setup({
 	chance = 750,
 	interval = 30,
 	aoc = 3,
-	min_height = water-16,
-	max_height = water+1
+	min_height = mobs_mc.water_level - 16,
+	max_height = mobs_mc.water_level + 1
 })
 
 --spawn egg