diff --git a/Changes.md b/Changes.md
index 250a0b981f..22c6ab0a7d 100644
--- a/Changes.md
+++ b/Changes.md
@@ -6,5 +6,3 @@ consolidating using generics with POCO objects and shared base class
 
 ## 4.0.0-alpha201802027a
 * Milan release 
-
-
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Debugging/DebuggerSourceMap.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Debugging/DebuggerSourceMap.cs
index 50c1a61a82..af7d2f2c27 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Debugging/DebuggerSourceMap.cs
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Debugging/DebuggerSourceMap.cs
@@ -228,8 +228,8 @@ orderby name.Length
                 options = from sourceItem in sourceByItem
                           let source = sourceItem.Value
                           where PathEquals(source.Path, row.Source.Path)
-                          where source.StartPoint.LineIndex >= row.SourceBreakpoint.Line
-                          let distance = Math.Abs(source.StartPoint.LineIndex - row.SourceBreakpoint.Line)
+                          where source.StartPoint.LineIndex <= row.SourceBreakpoint.Line && source.EndPoint.LineIndex >= row.SourceBreakpoint.Line
+                          let distance = row.SourceBreakpoint.Line - source.StartPoint.LineIndex
                           orderby distance
                           select sourceItem;
             }