diff --git a/p5rpc.modloader/Merging/Tbl/P3PTblMerger.cs b/p5rpc.modloader/Merging/Tbl/P3PTblMerger.cs
index 435d4fd..7ddfd1d 100644
--- a/p5rpc.modloader/Merging/Tbl/P3PTblMerger.cs
+++ b/p5rpc.modloader/Merging/Tbl/P3PTblMerger.cs
@@ -159,9 +159,10 @@ private async Task<byte[]> PatchMsgTable(byte[] extractedTable, List<string> can
     private async Task<byte[]> PatchAiCalc(byte[] extractedTable, List<string> candidates)
     {
         var bfs = new byte[18][];
+        // ToArray so we can remove items from the collection in the foreach
         var bfFiles = candidates.Where(x =>
             x.EndsWith("enemy.bf", StringComparison.OrdinalIgnoreCase) ||
-            x.EndsWith("friend.bf", StringComparison.OrdinalIgnoreCase));
+            x.EndsWith("friend.bf", StringComparison.OrdinalIgnoreCase)).ToArray();
         foreach (var bfFile in bfFiles)
         {
             _logger.Info($"Embedding {bfFile} into AICALC.TBL");
diff --git a/p5rpc.modloader/Merging/Tbl/P4GTblMerger.cs b/p5rpc.modloader/Merging/Tbl/P4GTblMerger.cs
index 6b2299f..18481a8 100644
--- a/p5rpc.modloader/Merging/Tbl/P4GTblMerger.cs
+++ b/p5rpc.modloader/Merging/Tbl/P4GTblMerger.cs
@@ -159,9 +159,10 @@ private async Task<byte[]> PatchMsgTable(byte[] extractedTable, List<string> can
     private async Task<byte[]> PatchAiCalc(byte[] extractedTable, List<string> candidates)
     {
         var bfs = new byte[11][];
+        // ToArray so we can remove items from the collection in the foreach
         var bfFiles = candidates.Where(x =>
             x.EndsWith("enemy.bf", StringComparison.OrdinalIgnoreCase) ||
-            x.EndsWith("friend.bf", StringComparison.OrdinalIgnoreCase));
+            x.EndsWith("friend.bf", StringComparison.OrdinalIgnoreCase)).ToArray();
         foreach (var bfFile in bfFiles)
         {
             _logger.Info($"Embedding {bfFile} into AICALC.TBL");