diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs
index 099e617aa..21d9d6d36 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs
@@ -170,6 +170,11 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
 					base.VisitSimpleType(simpleType);
 					return;
 				}
+				// HACK : ignore type names in attributes (TypeSystemAstBuilder doesn't handle them correctly)
+				if (simpleType.Parent is NRefactory.CSharp.Attribute) {
+					base.VisitSimpleType(simpleType);
+					return;
+				}
 				simpleType.ReplaceWith(astBuilder.ConvertType(rr.Type));
 			}
 		}
diff --git a/NRefactory b/NRefactory
index c57d52dd0..2d6565349 160000
--- a/NRefactory
+++ b/NRefactory
@@ -1 +1 @@
-Subproject commit c57d52dd02bc0a01815bb9313f4505d92cf75525
+Subproject commit 2d65653491ba5a804dd2b44b946b1d33b00c0623