diff --git a/hot-metals/data-final-fixes.lua b/hot-metals/data-final-fixes.lua
new file mode 100644
index 0000000..5a61b06
--- /dev/null
+++ b/hot-metals/data-final-fixes.lua
@@ -0,0 +1 @@
+require("prototypes/hot-metals-final")
\ No newline at end of file
diff --git a/hot-metals/prototypes/hot-metals-final.lua b/hot-metals/prototypes/hot-metals-final.lua
new file mode 100644
index 0000000..7b42417
--- /dev/null
+++ b/hot-metals/prototypes/hot-metals-final.lua
@@ -0,0 +1,9 @@
+-- Change technology triggers
+for _, tech in pairs(data.raw.technology) do
+    if tech.research_trigger then
+        local item = data.raw.item[tech.research_trigger.item]
+        if item and item.hot_item and not contains(HotMetals.skipTechUnlocksFor, item.name) then
+            tech.research_trigger.item = item.hot_item
+        end
+    end
+end
\ No newline at end of file
diff --git a/hot-metals/prototypes/hot-metals.lua b/hot-metals/prototypes/hot-metals.lua
index d6ab1a1..03e55e3 100644
--- a/hot-metals/prototypes/hot-metals.lua
+++ b/hot-metals/prototypes/hot-metals.lua
@@ -76,6 +76,8 @@ function createHotVariant(config)
     hotItem.spoil_ticks = spoilTicks
     data:extend({ hotItem })
 
+    item.hot_item = hotItem.name
+
     -- Change recipes
     for _, recipe in pairs(data.raw.recipe) do
         if contains(HotMetals.craftingCategories, recipe.category) then
@@ -101,13 +103,6 @@ function createHotVariant(config)
             end
         end
     end
-
-    -- Change technology triggers
-    for _, tech in pairs(data.raw.technology) do
-        if tech.research_trigger and tech.research_trigger.item == itemName and not contains(HotMetals.skipTechUnlocksFor, itemName) then
-            tech.research_trigger.item = hotItem.name
-        end
-    end
 end
 
 -- Checks if a table contains a certain value