diff --git a/IDEHelper/Compiler/BfSystem.cpp b/IDEHelper/Compiler/BfSystem.cpp
index 137e4a70..731953f2 100644
--- a/IDEHelper/Compiler/BfSystem.cpp
+++ b/IDEHelper/Compiler/BfSystem.cpp
@@ -770,8 +770,16 @@ void BfTypeDef::PopulateMemberSets()
 
 void BfTypeDef::ClearMemberSets()
 {
+	for (auto entry : mMethodSet)
+		((BfMethodDef*)entry.mMemberDef)->mNextWithSameName = NULL;
 	mMethodSet.Clear();
+
+	for (auto entry : mFieldSet)
+		((BfFieldDef*)entry.mMemberDef)->mNextWithSameName = NULL;
 	mFieldSet.Clear();
+
+	for (auto entry : mPropertySet)
+		((BfPropertyDef*)entry.mMemberDef)->mNextWithSameName = NULL;
 	mPropertySet.Clear();
 }