diff --git a/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs b/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs
index 181a32a7c..79cb5dbb8 100644
--- a/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs
+++ b/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs
@@ -297,12 +297,6 @@ namespace ILSpy.Debugger.Services
 			return CodeMappingsStorage.GetInstructionByTypeAndLine(
 				CurrentLineBookmark.Instance.Type.FullName,
 				CurrentLineBookmark.Instance.LineNumber, out token);
-			
-//			var val = CodeMappingsStorage[CurrentLineBookmark.Instance.Type.FullName];
-//
-//			var mapping = val.Find(m => m.MetadataToken == token);
-//
-//			return mapping.MemberCodeMappings.FirstOrDefault(s => s.ILInstructionOffset.From == instruction.ILInstructionOffset.From);
 		}
 		
 		StackFrame GetStackFrame()
diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs
index 584c77cdb..b9c357401 100644
--- a/ILSpy/TextView/DecompilerTextView.cs
+++ b/ILSpy/TextView/DecompilerTextView.cs
@@ -413,11 +413,11 @@ namespace ICSharpCode.ILSpy.TextView
 							// show the currentline marker
 							var bm = CurrentLineBookmark.Instance;
 							if (bm != null && DebugData.CurrentType != null) {
-								if (DebugData.CurrentType.FullName.Equals(bm.Type.FullName, StringComparison.OrdinalIgnoreCase)) {
+								if (DebugData.CurrentType == bm.Type) {
 									DocumentLine line = textEditor.Document.GetLineByNumber(bm.LineNumber);
 									bm.Marker = bm.CreateMarker(textMarkerService, line.Offset, line.Length);
-									UnfoldAndScroll(bm.LineNumber);
 								}
+								UnfoldAndScroll(bm.LineNumber);
 							}
 						} else {
 							// hide the margin