diff --git a/compat/logistica.lua b/compat/logistica.lua
index 79417ad..58098ee 100644
--- a/compat/logistica.lua
+++ b/compat/logistica.lua
@@ -48,14 +48,17 @@ for _,name in ipairs(logistica.group_get_all_nodes_for_group("injectors")) do
 	minetest.override_item(name,override)
 end
 
-local function startNodeTimer(pos)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+local function afterLogisticaAction(pos)
+	local def=minetest.registered_nodes[minetest.get_node(pos).name]
+	if def and def._industrialtest_self then
+		def._industrialtest_self:triggerIfNeeded(pos)
+	end
 end
 
 local function addLogisticaCompatibility(name)
 	local override={
-		_logistica_afterRequesterItemstackInsert=startNodeTimer,
-		_logistica_afterInjectorItemstackTake=startNodeTimer
+		_logistica_afterRequesterItemstackInsert=afterLogisticaAction,
+		_logistica_afterInjectorItemstackTake=afterLogisticaAction
 	}
 	minetest.override_item(name,override)
 end
diff --git a/machines/fluid_generator.lua b/machines/fluid_generator.lua
index 2ce89a7..a4b31dd 100644
--- a/machines/fluid_generator.lua
+++ b/machines/fluid_generator.lua
@@ -167,6 +167,13 @@ function industrialtest.GeothermalGenerator.onConstruct(self,pos)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
 
+function industrialtest.GeothermalGenerator.update(self,pos,elapsed,meta,inv)
+	local srcSlot=inv:get_stack("src",1)
+	local dstSlot=inv:get_stack("dst",1)
+	local shouldUpdateFormspec=takeFuelFromItem(self,pos)
+	return (not srcSlot:is_empty() and dstSlot:get_free_space()>0 and not industrialtest.api.isFluidStorageFull(meta)),shouldUpdateFormspec
+end
+
 function industrialtest.GeothermalGenerator.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	return math.min(allowMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex,count),industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count))
 end
@@ -191,16 +198,22 @@ end
 
 function industrialtest.GeothermalGenerator.shouldActivate(self,pos)
 	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local srcSlot=inv:get_stack("src",1)
+	local dstSlot=inv:get_stack("dst",1)
 	local fluidAmount=meta:get_float("fluidAmount")
 
-	return fluidAmount>0 and not industrialtest.api.isFullyCharged(meta)
+	return (fluidAmount>0 or (not srcSlot:is_empty() and dstSlot:get_free_space()>0)) and not industrialtest.api.isFullyCharged(meta)
 end
 
 function industrialtest.GeothermalGenerator.shouldDeactivate(self,pos)
 	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local srcSlot=inv:get_stack("src",1)
+	local dstSlot=inv:get_stack("dst",1)
 	local fluidAmount=meta:get_float("fluidAmount")
 
-	return fluidAmount<=0 or industrialtest.api.isFullyCharged(meta)
+	return (fluidAmount<=0 and (srcSlot:is_empty() or dstSlot:get_free_space()==0)) or industrialtest.api.isFullyCharged(meta)
 end
 
 function industrialtest.GeothermalGenerator.activeUpdate(self,pos,elapsed)
@@ -270,9 +283,12 @@ end
 
 function industrialtest.WaterMill.canUpdate(self,pos)
 	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local srcSlot=inv:get_stack("src",1)
+	local dstSlot=inv:get_stack("dst",1)
 	local fluidAmount=meta:get_float("fluidAmount")
 
-	return fluidAmount>0 and not industrialtest.api.isFullyCharged(meta)
+	return (fluidAmount>0 or (not srcSlot:is_empty() and dstSlot:get_free_space()>0)) and not industrialtest.api.isFullyCharged(meta)
 end
 
 function industrialtest.WaterMill.update(self,pos,elapsed)