diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 00dac4117..ed6d64c3f 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -52,40 +52,13 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
 
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
+        
+        auto file = loadIndexedPackVersion(obj);
+        if(!file.addonId.isValid())
+            file.addonId = pack.addonId;
 
-        auto versionArray = Json::requireArray(obj, "gameVersions");
-        if (versionArray.isEmpty()) {
-            continue;
-        }
-
-        ModPlatform::IndexedVersion file;
-        for (auto mcVer : versionArray) {
-            auto str = mcVer.toString();
-
-            if (str.contains('.'))
-                file.mcVersion.append(str);
-        }
-
-        file.addonId = pack.addonId;
-        file.fileId = Json::requireInteger(obj, "id");
-        file.date = Json::requireString(obj, "fileDate");
-        file.version = Json::requireString(obj, "displayName");
-        file.downloadUrl = Json::requireString(obj, "downloadUrl");
-        file.fileName = Json::requireString(obj, "fileName");
-
-        auto hash_list = Json::ensureArray(obj, "hashes");
-        for(auto h : hash_list){
-            auto hash_entry = Json::ensureObject(h);
-            auto hash_types = ProviderCaps.hashType(ModPlatform::Provider::FLAME);
-            auto hash_algo = enumToString(Json::ensureInteger(hash_entry, "algo", 1, "algorithm"));
-            if(hash_types.contains(hash_algo)){
-                file.hash = Json::requireString(hash_entry, "value");
-                file.hash_type = hash_algo;
-                break;
-            }
-        }
-
-        unsortedVersions.append(file);
+        if(file.fileId.isValid()) // Heuristic to check if the returned value is valid
+            unsortedVersions.append(file);
     }
 
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
@@ -96,3 +69,39 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     pack.versions = unsortedVersions;
     pack.versionsLoaded = true;
 }
+
+auto FlameMod::loadIndexedPackVersion(QJsonObject& obj) -> ModPlatform::IndexedVersion
+{
+    auto versionArray = Json::requireArray(obj, "gameVersions");
+    if (versionArray.isEmpty()) {
+        return {};
+    }
+
+    ModPlatform::IndexedVersion file;
+    for (auto mcVer : versionArray) {
+        auto str = mcVer.toString();
+
+        if (str.contains('.'))
+            file.mcVersion.append(str);
+    }
+
+    file.addonId = Json::requireInteger(obj, "modId");
+    file.fileId = Json::requireInteger(obj, "id");
+    file.date = Json::requireString(obj, "fileDate");
+    file.version = Json::requireString(obj, "displayName");
+    file.downloadUrl = Json::requireString(obj, "downloadUrl");
+    file.fileName = Json::requireString(obj, "fileName");
+
+    auto hash_list = Json::ensureArray(obj, "hashes");
+    for (auto h : hash_list) {
+        auto hash_entry = Json::ensureObject(h);
+        auto hash_types = ProviderCaps.hashType(ModPlatform::Provider::FLAME);
+        auto hash_algo = enumToString(Json::ensureInteger(hash_entry, "algo", 1, "algorithm"));
+        if (hash_types.contains(hash_algo)) {
+            file.hash = Json::requireString(hash_entry, "value");
+            file.hash_type = hash_algo;
+            break;
+        }
+    }
+    return file;
+}
diff --git a/launcher/modplatform/flame/FlameModIndex.h b/launcher/modplatform/flame/FlameModIndex.h
index d3171d943..2e0f2e864 100644
--- a/launcher/modplatform/flame/FlameModIndex.h
+++ b/launcher/modplatform/flame/FlameModIndex.h
@@ -16,5 +16,6 @@ void loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                              QJsonArray& arr,
                              const shared_qobject_ptr<QNetworkAccessManager>& network,
                              BaseInstance* inst);
+auto loadIndexedPackVersion(QJsonObject& obj) -> ModPlatform::IndexedVersion;
 
 }  // namespace FlameMod
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 91a5f9c65..ee82f8a0c 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -58,8 +58,8 @@ auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, Mo
     mod.hash = mod_version.hash;
 
     mod.provider = mod_pack.provider;
-    mod.file_id = mod_pack.addonId;
-    mod.project_id = mod_version.fileId;
+    mod.file_id = mod_version.fileId;
+    mod.project_id = mod_pack.addonId;
 
     return mod;
 }