diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
index 28ae0b396..a81968ad3 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
@@ -115,12 +115,19 @@ public String getCondition() {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof IBreakpoint)) {
+        if (!(obj instanceof Breakpoint)) {
             return super.equals(obj);
         }
 
-        IBreakpoint breakpoint = (IBreakpoint) obj;
-        return Objects.equals(this.className(), breakpoint.className()) && this.getLineNumber() == breakpoint.getLineNumber();
+        Breakpoint breakpoint = (Breakpoint) obj;
+        return Objects.equals(this.className(), breakpoint.className())
+                && this.getLineNumber() == breakpoint.getLineNumber()
+                && Objects.equals(this.methodSignature, breakpoint.methodSignature);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.className, this.lineNumber, this.methodSignature);
     }
 
     @Override
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java
index 1a0647411..9b3fdb2dd 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java
@@ -11,15 +11,15 @@
 
 package com.microsoft.java.debug.core;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.sun.jdi.event.ThreadDeathEvent;
+import org.apache.commons.lang3.StringUtils;
+
 import com.sun.jdi.ThreadReference;
 import com.sun.jdi.VirtualMachine;
+import com.sun.jdi.event.ThreadDeathEvent;
 
 import io.reactivex.disposables.Disposable;
 
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/BreakpointManager.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/BreakpointManager.java
index 4b0a7ae89..eaf1bb56f 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/BreakpointManager.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/BreakpointManager.java
@@ -79,12 +79,12 @@ public IBreakpoint[] setBreakpoints(String source, IBreakpoint[] breakpoints, bo
 
         // Compute the breakpoints that are newly added.
         List<IBreakpoint> toAdd = new ArrayList<>();
-        List<Integer> visitedLineNumbers = new ArrayList<>();
+        List<Integer> visitedBreakpoints = new ArrayList<>();
         for (IBreakpoint breakpoint : breakpoints) {
-            IBreakpoint existed = breakpointMap.get(String.valueOf(breakpoint.getLineNumber()));
+            IBreakpoint existed = breakpointMap.get(String.valueOf(breakpoint.hashCode()));
             if (existed != null) {
                 result.add(existed);
-                visitedLineNumbers.add(existed.getLineNumber());
+                visitedBreakpoints.add(existed.hashCode());
                 continue;
             } else {
                 result.add(breakpoint);
@@ -95,7 +95,7 @@ public IBreakpoint[] setBreakpoints(String source, IBreakpoint[] breakpoints, bo
         // Compute the breakpoints that are no longer listed.
         List<IBreakpoint> toRemove = new ArrayList<>();
         for (IBreakpoint breakpoint : breakpointMap.values()) {
-            if (!visitedLineNumbers.contains(breakpoint.getLineNumber())) {
+            if (!visitedBreakpoints.contains(breakpoint.hashCode())) {
                 toRemove.add(breakpoint);
             }
         }
@@ -113,7 +113,7 @@ private void addBreakpointsInternally(String source, IBreakpoint[] breakpoints)
             for (IBreakpoint breakpoint : breakpoints) {
                 breakpoint.putProperty("id", this.nextBreakpointId.getAndIncrement());
                 this.breakpoints.add(breakpoint);
-                breakpointMap.put(String.valueOf(breakpoint.getLineNumber()), breakpoint);
+                breakpointMap.put(String.valueOf(breakpoint.hashCode()), breakpoint);
             }
         }
     }
@@ -133,7 +133,7 @@ private void removeBreakpointsInternally(String source, IBreakpoint[] breakpoint
                     // Destroy the breakpoint on the debugee VM.
                     breakpoint.close();
                     this.breakpoints.remove(breakpoint);
-                    breakpointMap.remove(String.valueOf(breakpoint.getLineNumber()));
+                    breakpointMap.remove(String.valueOf(breakpoint.hashCode()));
                 } catch (Exception e) {
                     logger.log(Level.SEVERE, String.format("Remove breakpoint exception: %s", e.toString()), e);
                 }
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java
index 65b4c2faa..364ddb1ec 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java
@@ -38,10 +38,21 @@ public boolean visit(LambdaExpression node) {
             int startPosition = node.getStartPosition();
 
             int startColumn = this.compilationUnit.getColumnNumber(startPosition);
-            int endColumn = this.compilationUnit.getColumnNumber(startPosition + node.getLength());
-            int lineNumber = this.compilationUnit.getLineNumber(startPosition);
+            int endPosition = startPosition + node.getLength();
+            int endColumn = this.compilationUnit.getColumnNumber(endPosition);
+            int startLine = this.compilationUnit.getLineNumber(startPosition);
+            int endLine = this.compilationUnit.getLineNumber(endPosition);
 
-            if (column >= startColumn && column <= endColumn && lineNumber == line) {
+            // lambda on same line:
+            // list.stream().map(i -> i + 1);
+            //
+            // lambda on multiple lines:
+            // list.stream().map(user
+            // -> user.isSystem() ? new SystemUser(user) : new EndUser(user));
+
+            if ((startLine == endLine && column >= startColumn && column <= endColumn && line == startLine)
+                    || (startLine != endLine && line >= startLine && line <= endLine
+                            && (column >= startColumn || column <= endColumn))) {
                 this.lambdaMethodBinding = node.resolveMethodBinding();
                 this.found = true;
                 this.lambdaExpression = node;