diff --git a/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs b/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs
index fec6bd7158..75b0441eef 100644
--- a/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs
+++ b/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs
@@ -232,7 +232,9 @@ namespace Debugger
 		{
 			var info = GetInfo(method.ParentAssembly);
 			var variableTypes = info.GetLocalVariableTypes(method.UnresolvedMember);
-			return variableTypes[index].Resolve(new SimpleTypeResolveContext(method));
+			return variableTypes[index]
+				.Resolve(new SimpleTypeResolveContext(method))
+				.AcceptVisitor(method.Substitution);
 		}
 		#endregion
 		
diff --git a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
index 218178354b..24a89a5cb8 100644
--- a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
+++ b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
@@ -106,7 +106,7 @@ namespace ICSharpCode.ILSpyAddIn
 			return symbols.LocalVariables.Where(v => v.OriginalVariable != null).Select(
 				v => new Debugger.ILLocalVariable() {
 					Index = v.OriginalVariable.Index,
-					Type = loader.ReadTypeReference(v.Type).Resolve(context),
+					Type = loader.ReadTypeReference(v.Type).Resolve(context).AcceptVisitor(method.Substitution),
 					Name = v.Name,
 					IsCompilerGenerated = false,
 					ILRanges = new [] { new ILRange(0, int.MaxValue) }