diff --git a/network.lua b/network.lua
index 9c18baf..e9bd423 100644
--- a/network.lua
+++ b/network.lua
@@ -248,6 +248,9 @@ function holostorage.network.register_abm_controller(name)
 					end
 					if nodedef and nodedef.holostorage_run then
 						nodedef.holostorage_run(pos2, node2, pos)
+					elseif nodedef then
+						local imeta = minetest.get_meta(pos2)
+						imeta:set_string("infotext", ("%s Active"):format(nodedef.description))
 					end
 				end
 			end
diff --git a/nodes/solderer.lua b/nodes/solderer.lua
index 4ce901a..c3fcb6d 100644
--- a/nodes/solderer.lua
+++ b/nodes/solderer.lua
@@ -132,12 +132,10 @@ local function run_solderer(pos, _, controller)
 	while true do
 		local result = holostorage.solderer.get_recipe(inv:get_list("src"))
 		if not result then
-			local swap = holostorage.helpers.swap_node(pos, machine_node)
-			if swap then
-				meta:set_string("infotext", "Solderer Idle")
-				meta:set_string("formspec", get_formspec())
-				meta:set_int("src_time", 0)
-			end
+			holostorage.helpers.swap_node(pos, machine_node)
+			meta:set_string("infotext", "Solderer Idle")
+			meta:set_string("formspec", get_formspec())
+			meta:set_int("src_time", 0)
 			return
 		end
 		meta:set_int("src_time", meta:get_int("src_time") + round(machine_speed * 10))