diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp
index 57b788e4..3204f68b 100644
--- a/IDEHelper/Compiler/BfModule.cpp
+++ b/IDEHelper/Compiler/BfModule.cpp
@@ -3310,6 +3310,8 @@ void BfModule::PopulateGlobalContainersList(const BfGlobalLookup& globalLookup)
 	BP_ZONE("PopulateGlobalContainersList");
 
 	BfTypeDef* userTypeDef = mContext->mCurTypeState->mCurTypeDef;
+	if ((userTypeDef == NULL) && (mCurMethodInstance != NULL))
+		userTypeDef = mCurMethodInstance->mMethodDef->mDeclaringType;
 	if (userTypeDef == NULL)
 		userTypeDef = mCurTypeInstance->mTypeDef;