diff --git a/Passepartout/Library/Sources/LegacyV2/Domain/MapperV2.swift b/Passepartout/Library/Sources/LegacyV2/Domain/MapperV2.swift
index adb85d2a..3237089e 100644
--- a/Passepartout/Library/Sources/LegacyV2/Domain/MapperV2.swift
+++ b/Passepartout/Library/Sources/LegacyV2/Domain/MapperV2.swift
@@ -34,8 +34,6 @@ struct MapperV2 {
         builder.name = v2.header.name
         builder.attributes.lastUpdate = v2.header.lastUpdate
 
-        modules.append(toOnDemandModule(v2.onDemand))
-
         if let provider = v2.provider {
             if let module = try toProviderModule(provider) {
                 let providerId = ProviderID(rawValue: provider.name)
@@ -52,6 +50,8 @@ struct MapperV2 {
             modules.append($0)
         }
 
+        modules.append(toOnDemandModule(v2.onDemand))
+
         builder.modules = modules
         builder.activeModulesIds = Set(modules.map(\.id))
         return try builder.tryBuild()