diff --git a/IDEHelper/Compiler/BfAutoComplete.cpp b/IDEHelper/Compiler/BfAutoComplete.cpp
index 56dd4cf9..e7bc3869 100644
--- a/IDEHelper/Compiler/BfAutoComplete.cpp
+++ b/IDEHelper/Compiler/BfAutoComplete.cpp
@@ -2627,6 +2627,13 @@ void BfAutoComplete::CheckMethod(BfMethodDeclaration* methodDeclaration, bool is
 			{
 				mInsertStartIdx = methodDeclaration->GetSrcStart();
 				mInsertEndIdx = methodDeclaration->GetSrcEnd();
+				if (methodDeclaration->mBody != NULL)
+				{
+					if (methodDeclaration->mBody->mTriviaStart != -1)
+						mInsertEndIdx = methodDeclaration->mBody->mTriviaStart;
+					else
+						mInsertEndIdx = methodDeclaration->mBody->GetSrcStart();
+				}
 			}
 
 			String filter;
diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp
index fdfcc528..ab876ecb 100644
--- a/IDEHelper/Compiler/BfModule.cpp
+++ b/IDEHelper/Compiler/BfModule.cpp
@@ -22337,7 +22337,7 @@ void BfModule::DoMethodDeclaration(BfMethodDeclaration* methodDeclaration, bool
 				nameNode = ctorDeclaration->mThisToken;
 		}
 
-		if (autoComplete->IsAutocompleteNode(nameNode))
+		if ((autoComplete->IsAutocompleteNode(nameNode)) && (autoComplete->mResolveType != BfResolveType_Autocomplete))
 		{
 			autoComplete->mInsertStartIdx = nameNode->GetSrcStart();
 			autoComplete->mInsertEndIdx = nameNode->GetSrcEnd();