diff --git a/PHI-CL/control/infinity-container.lua b/PHI-CL/control/infinity-container.lua
index ea99f62..5a347f9 100644
--- a/PHI-CL/control/infinity-container.lua
+++ b/PHI-CL/control/infinity-container.lua
@@ -3,15 +3,18 @@ local chest_filter = {}
 
 do
     for _, q in pairs(prototypes.quality) do
-        local q_name = q.name
-        local j = 0
-        chest_filter[q_name] = {}
+        chest_filter[q.name] = {}
+    end
 
-        for _, i in pairs(prototypes.item) do
-            if not i.hidden and not (i.subgroup and (i.subgroup == 'parameters' or i.subgroup == 'spawnables')) then
-                j = j + 1
-                table.insert(chest_filter[q_name], {index = j, name = i.name, quality = q_name, mode = 'exactly', count = i.stack_size})
+    local j = 1
+
+    for _, i in pairs(prototypes.item) do
+        if not i.hidden and not (i.subgroup and (i.subgroup == 'parameters' or i.subgroup == 'spawnables')) then
+            for _, q in pairs(prototypes.quality) do
+                table.insert(chest_filter[q.name], {index = j, name = i.name, quality = q.name, mode = 'exactly', count = i.stack_size})
             end
+
+            j = j + 1
         end
     end
 end
diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua
index 8970fa6..8802a00 100644
--- a/PHI-CL/data-final-fixes.lua
+++ b/PHI-CL/data-final-fixes.lua
@@ -1,11 +1,3 @@
 if settings.startup['PHI-CT'].value then
-    if data.raw['infinity-container']['super-infinity-chest'] then
-        local sc = 2
-
-        for c in pairs(defines.prototypes.item) do
-            sc = sc + table_size(data.raw[c] or {})
-        end
-
-        data.raw['infinity-container']['super-infinity-chest'].inventory_size = sc
-    end
-end
\ No newline at end of file
+    require('data.f.ct')
+end
diff --git a/PHI-CL/data/f/ct.lua b/PHI-CL/data/f/ct.lua
new file mode 100644
index 0000000..c8ae2f1
--- /dev/null
+++ b/PHI-CL/data/f/ct.lua
@@ -0,0 +1,12 @@
+
+if data.raw['infinity-container']['super-infinity-chest'] then
+    local sc = 2
+
+    for _, i in pairs(prototypes.item) do
+        if not i.hidden and not (i.subgroup and (i.subgroup == 'parameters' or i.subgroup == 'spawnables')) then
+            sc = sc + 1
+        end
+    end
+
+    data.raw['infinity-container']['super-infinity-chest'].inventory_size = sc
+end