diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp
index 27b7fd4d..77dde7c5 100644
--- a/IDEHelper/Compiler/BfModule.cpp
+++ b/IDEHelper/Compiler/BfModule.cpp
@@ -9869,6 +9869,12 @@ BfOperatorInfo* BfModule::GetOperatorInfo(BfTypeInstance* typeInstance, BfOperat
 		SetAndRestoreValue<bool> ignoreErrors(mIgnoreErrors, true);
 		SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(mCurTypeInstance, typeInstance);
 		SetAndRestoreValue<BfMethodInstance*> prevMethodInstance(mCurMethodInstance, NULL);
+
+		BfTypeState typeState;		
+		typeState.mTypeInstance = typeInstance;
+		typeState.mCurTypeDef = operatorDef->mDeclaringType;
+		SetAndRestoreValue<BfTypeState*> prevTypeState(mContext->mCurTypeState, &typeState);
+
 		BfOperatorInfo* operatorInfo = new BfOperatorInfo();
 		if (operatorDef->mReturnTypeRef != NULL)
 			operatorInfo->mReturnType = ResolveTypeRef(operatorDef->mReturnTypeRef, BfPopulateType_Identity);