diff --git a/gradle.properties b/gradle.properties
index aeae695a9..23d0ecabb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,8 +10,8 @@ pluginRepositoryUrl = https://github.com/HaxeFoundation/intellij-haxe
 pluginVersion = 1.5.3
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
-#platformType = IU
-platformType = IC
+platformType = IU
+#platformType = IC
 
 #platformVersion = 2023.3
 platformVersion = 2024.1
@@ -26,8 +26,8 @@ pluginUntilBuild = 241.*
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 # see flex/flash versions at : https://plugins.jetbrains.com/plugin/14508-flash-flex/versions/stable/252411
-#platformPlugins = com.intellij.java, com.intellij.flex:241.14494.158, JavaScript
-platformPlugins = com.intellij.java, com.intellij.flex:241.14494.158
+platformPlugins = com.intellij.java, com.intellij.flex:241.14494.158, JavaScript
+#platformPlugins = com.intellij.java, com.intellij.flex:241.14494.158
 #platformPlugins = com.intellij.java, com.intellij.flex:233.11799.196, JavaScript
 #platformPlugins = com.intellij.java, com.intellij.flex:233.11799.196
 #platformPlugins = com.intellij.java, com.intellij.flex:241.14494.17, JavaScript
diff --git a/src/main/java/com/intellij/plugins/haxe/haxelib/definitions/HaxeDefineDetectionManager.java b/src/main/java/com/intellij/plugins/haxe/haxelib/definitions/HaxeDefineDetectionManager.java
index 5a5b900b2..097ea48b8 100644
--- a/src/main/java/com/intellij/plugins/haxe/haxelib/definitions/HaxeDefineDetectionManager.java
+++ b/src/main/java/com/intellij/plugins/haxe/haxelib/definitions/HaxeDefineDetectionManager.java
@@ -74,9 +74,12 @@ public Map<String, String> getAllDefinitions() {
       .forEach( e -> map.put(e.getKey(), e.getValue()));
 
     if (instance.getAutoDetectDefinitions()) {
-      for (Module module : moduleDefinitionsMap.keySet()) {
+
         // add  all auto detected values
-        moduleDefinitionsMap.values().stream()
+
+        moduleDefinitionsMap.entrySet().stream()
+          .filter(e -> e.getKey().getProject() == myProject)
+          .map(Map.Entry::getValue)
           .flatMap(map1 -> map1.entrySet().stream())
           .filter(not(HaxeDefineDetectionManager::isUnsetFlag))
           .forEach( e -> map.put(e.getKey(), e.getValue()));
@@ -84,7 +87,7 @@ public Map<String, String> getAllDefinitions() {
         //TODO move project defines to module level settings
         //HaxeModuleSettings moduleSettings = HaxeModuleSettings.getInstance(module);
         //HaxeTarget target = moduleSettings.getHaxeTarget();
-      }
+
       // remove any value marked with unset flag (*UNSET*)
       projectUserDefineMap.entrySet().stream()
         .filter(HaxeDefineDetectionManager::isUnsetFlag)