diff --git a/IDEHelper/Compiler/BfIRBuilder.cpp b/IDEHelper/Compiler/BfIRBuilder.cpp
index 07806541..2c8380b5 100644
--- a/IDEHelper/Compiler/BfIRBuilder.cpp
+++ b/IDEHelper/Compiler/BfIRBuilder.cpp
@@ -2717,6 +2717,9 @@ void BfIRBuilder::CreateTypeDeclaration(BfType* type, bool forceDbgDefine)
 	if ((typeInstance != NULL) && (typeInstance->mModule != NULL))
 		populateModule = typeInstance->mModule;
 
+	//TODO: Temporary
+	populateModule = mModule;
+
 	bool wantDIData = DbgHasInfo() && (!type->IsUnspecializedType());
 			
 	// Types that don't have a proper 'defining module' need to be defined in every module they are used