diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
index f331403426..21ca4f8169 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
@@ -1096,11 +1096,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 				if (!IsLineEmptyUpToEol ())
 					return null;
+				var state = GetState ();
 				
-				overrideCls = CSharpParsedFile.GetInnermostTypeDefinition (location);
-				if (overrideCls != null && (overrideCls.Kind == TypeKind.Class || overrideCls.Kind == TypeKind.Struct)) {
+				if (state.CurrentTypeDefinition != null && (state.CurrentTypeDefinition.Kind == TypeKind.Class || state.CurrentTypeDefinition.Kind == TypeKind.Struct)) {
 					string modifiers = document.GetText (firstMod, wordStart - firstMod);
-					return GetPartialCompletionData (overrideCls, modifiers);
+					return GetPartialCompletionData (state.CurrentTypeDefinition, modifiers);
 				}
 				return null;
 				
@@ -1114,7 +1114,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				if (accessorContext != null)
 					return accessorContext;
 				wrapper = new CompletionDataWrapper (this);
-				var state = GetState ();
+				state = GetState ();
 				AddTypesAndNamespaces (wrapper, state, null, null, m => false);
 				AddKeywords (wrapper, typeLevelKeywords);
 				AddKeywords (wrapper, primitiveTypesKeywords);
@@ -1353,71 +1353,56 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			return wrapper.Result;
 		}
 		
-		IEnumerable<ICompletionData> GetPartialCompletionData (IUnresolvedTypeDefinition type, string modifiers)
+		IEnumerable<ICompletionData> GetPartialCompletionData (ITypeDefinition type, string modifiers)
 		{
 			var wrapper = new CompletionDataWrapper (this);
-			var partialType = type.Resolve (ctx);
-			if (partialType != null) {
-				int declarationBegin = offset;
-				int j = declarationBegin;
-				for (int i = 0; i < 3; i++) {
-					switch (GetPreviousToken (ref j, true)) {
-					case "public":
-					case "protected":
-					case "private":
-					case "internal":
-					case "sealed":
-					case "override":
-						declarationBegin = j;
-						break;
-					case "static":
-						return null; // don't add override completion for static members
-					}
-				}
-				
-				var methods = new List<IMethod> ();
-				// gather all partial methods without implementation
-/* TODO:		foreach (var method in partialType.GetMethods ()) {
-					if (method.IsPartial && method.BodyRegion.IsEmpty) {
-						methods.Add (method);
-					}
+			int declarationBegin = offset;
+			int j = declarationBegin;
+			for (int i = 0; i < 3; i++) {
+				switch (GetPreviousToken (ref j, true)) {
+				case "public":
+				case "protected":
+				case "private":
+				case "internal":
+				case "sealed":
+				case "override":
+					declarationBegin = j;
+					break;
+				case "static":
+					return null; // don't add override completion for static members
 				}
-
-				// now filter all methods that are implemented in the compound class
-				foreach (var part in partialType.GetParts ()) {
-					if (part == type)
-						continue;
-					for (int i = 0; i < methods.Count; i++) {
-						var curMethod = methods [i];
-						var method = GetImplementation (partialType, curMethod);
-						if (method != null && !method.BodyRegion.IsEmpty) {
-							methods.RemoveAt (i);
-							i--;
+			}
+			
+			var methods = new List<IUnresolvedMethod> ();
+			
+			foreach (var part in type.Parts) {
+				foreach (var method in part.Methods) {
+					if (method.BodyRegion.IsEmpty) {
+						if (GetImplementation (type, method) != null)
 							continue;
-						}
+						methods.Add (method);
 					}
-				}
-				 */
-				
-				foreach (var method in methods) {
-					wrapper.Add (factory.CreateNewOverrideCompletionData (declarationBegin, type, method));
-				}
-				
+				}	
 			}
+			
+			foreach (var method in methods) {
+				wrapper.Add (factory.CreateNewPartialCompletionData (declarationBegin, method.DeclaringTypeDefinition, method));
+			} 
+			
 			return wrapper.Result;
 		}
 		
-		IMethod GetImplementation (ITypeDefinition type, IMethod method)
+		IMethod GetImplementation (ITypeDefinition type, IUnresolvedMethod method)
 		{
 			foreach (var cur in type.Methods) {
 				if (cur.Name == method.Name && cur.Parameters.Count == method.Parameters.Count && !cur.BodyRegion.IsEmpty) {
 					bool equal = true;
-					for (int i = 0; i < cur.Parameters.Count; i++) {
+					/*for (int i = 0; i < cur.Parameters.Count; i++) {
 						if (!cur.Parameters [i].Type.Equals (method.Parameters [i].Type)) {
 							equal = false;
 							break;
 						}
-					}
+					}*/
 					if (equal)
 						return cur;
 				}
diff --git a/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs b/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs
index e2647f32cb..fe367f4eb0 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs
@@ -63,6 +63,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		ICompletionData CreateEventCreationCompletionData (string varName, IType delegateType, IEvent evt, string parameterDefinition, IUnresolvedMember currentMember, IUnresolvedTypeDefinition currentType);
 
 		ICompletionData CreateNewOverrideCompletionData (int declarationBegin, IUnresolvedTypeDefinition type, IMember m);
+		ICompletionData CreateNewPartialCompletionData (int declarationBegin, IUnresolvedTypeDefinition type, IUnresolvedMember m);
 		
 		IEnumerable<ICompletionData> CreateCodeTemplateCompletionData ();
 		
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
index 2c7718a0a5..9cf9cc227d 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
@@ -183,7 +183,12 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			{
 				return new CompletionData (m.Name);
 			}
-
+			
+			public ICompletionData CreateNewPartialCompletionData (int declarationBegin, IUnresolvedTypeDefinition type, IUnresolvedMember m)
+			{
+				return new CompletionData (m.Name);
+			}
+			
 			public System.Collections.Generic.IEnumerable<ICompletionData> CreateCodeTemplateCompletionData ()
 			{
 				return Enumerable.Empty<ICompletionData> ();
@@ -4026,7 +4031,6 @@ void TestMethod ()
 			Assert.IsNotNull (provider.Find ("TF1"));
 		}
 		
-		[Ignore("Partial handling missing.")]
 		[Test()]
 		public void TestPartialCompletionData ()
 		{