diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
index 0244fd0e02..cb2c268071 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
@@ -1217,7 +1217,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		{
 			if (type == null || type.DeclaringType != null)
 				return type;
-			var result = ctx.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameterCount, StringComparer.Ordinal);
+			var result = ctx.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameterCount, StringComparer.Ordinal) ?? type;
+			if (result.GetParts ().Count == 1)
+				return type;
 //			Console.WriteLine ("result:"+  result);
 			return result;
 		}
diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
index 0875495057..9c80de254e 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
@@ -203,8 +203,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				if (!didAppendSemicolon)
 					wrapper.Append (';');
 			}
-			Console.WriteLine ("1111111111");
-			Console.WriteLine (wrapper);
 		}
 
 		protected CompilationUnit ParseStub (string continuation, bool appendSemicolon = true)