diff --git a/mods/mobs/npcs/blacksmith.lua b/mods/mobs/npcs/blacksmith.lua
index 261de98..46876b5 100644
--- a/mods/mobs/npcs/blacksmith.lua
+++ b/mods/mobs/npcs/blacksmith.lua
@@ -59,7 +59,7 @@ mobs:register_mob("mobs:blacksmith",{
 	blood_offset = 0.25,
 	activity_level = 1,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
 
diff --git a/mods/mobs/npcs/kids.lua b/mods/mobs/npcs/kids.lua
index 629ad70..e9f1234 100644
--- a/mods/mobs/npcs/kids.lua
+++ b/mods/mobs/npcs/kids.lua
@@ -61,7 +61,7 @@ mobs:register_mob("mobs:kid_lost", {
 		{chance=60, item="potions:magic_replenish1"},
 	},
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 	passive = false,
 	stationary = true,
diff --git a/mods/mobs/npcs/men.lua b/mods/mobs/npcs/men.lua
index ba23608..4e2925d 100644
--- a/mods/mobs/npcs/men.lua
+++ b/mods/mobs/npcs/men.lua
@@ -59,7 +59,7 @@ mobs:register_mob("mobs:male1_npc",{
 	},
 	walk_chance = 12,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
 
@@ -124,7 +124,7 @@ mobs:register_mob("mobs:male2_npc",{
 	},
 	walk_chance = 8,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
 
@@ -189,6 +189,6 @@ mobs:register_mob("mobs:male3_npc",{
 	},
 	walk_chance = 2,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
diff --git a/mods/mobs/npcs/women.lua b/mods/mobs/npcs/women.lua
index 3b27157..9759f61 100644
--- a/mods/mobs/npcs/women.lua
+++ b/mods/mobs/npcs/women.lua
@@ -55,7 +55,7 @@ type = "npc",
 		{chance=60, item="potions:magic_replenish1"},
 	},
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
 
@@ -117,7 +117,7 @@ type = "npc",
 	},
 	walk_chance = 5,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
 
@@ -178,7 +178,7 @@ type = "npc",
 	},
 	walk_chance = 9,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 })
 
@@ -235,7 +235,7 @@ type = "npc_special",
 	},
 	walk_chance = 0,
 	lifetimer = false,
-	avoid_nodes = {"default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
+	avoid_nodes = {"fire:basic_flame","default:water_source","default:water_flowing","default:lava_source","default:lava_flowing"},
 	avoid_range = 4,
 	on_step = function(self,dtime)
 		self.timer = self.timer+dtime