diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java b/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java index 28de20836..b76238402 100644 --- a/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java +++ b/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java @@ -183,9 +183,13 @@ public Set generateModuleDependencies(String branchPath, Str Map> mutualDependencies = detectMutualDependencies(rmPage.getContent()); modulesRequired.addAll(mutualDependencies.keySet()); - //If we're not an Edition, remove all international modules + //If we're not an Edition, remove all international modules, but keep the Derivative modules if (!isEdition) { - modulesRequired.removeAll(cachedInternationalModules); + for (String module : cachedInternationalModules) { + if (modulesIncluded == null || !modulesIncluded.contains(module)) { + modulesRequired.remove(module); + } + } } //Recover all these module concepts to find out what module they themselves were defined in.