diff --git a/IDEHelper/Compiler/BfContext.cpp b/IDEHelper/Compiler/BfContext.cpp
index e3bbe6e4..5cba1ce6 100644
--- a/IDEHelper/Compiler/BfContext.cpp
+++ b/IDEHelper/Compiler/BfContext.cpp
@@ -2078,7 +2078,8 @@ void BfContext::UpdateRevisedTypes()
 			continue;
 		}
 		
-		typeInst->mRebuildFlags = BfTypeRebuildFlag_None;
+		// Clear flags we don't want to propagate
+		typeInst->mRebuildFlags = (BfTypeRebuildFlags)(typeInst->mRebuildFlags & BfTypeRebuildFlag_UnderlyingTypeDeferred);
 		
 		if (typeDef->mIsPartial)
 		{