diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/DebuggerPane.java b/jOOQ-console/src/main/java/org/jooq/debug/console/DebuggerPane.java
index 791041217b..9c57cee53e 100644
--- a/jOOQ-console/src/main/java/org/jooq/debug/console/DebuggerPane.java
+++ b/jOOQ-console/src/main/java/org/jooq/debug/console/DebuggerPane.java
@@ -381,14 +381,18 @@ public class DebuggerPane extends JPanel {
 
     void modifyBreakpoint(Breakpoint breakpoint) {
         int childCount = rootNode.getChildCount();
+
         for (int i = 0; i < childCount; i++) {
             CheckBoxNode checkBoxNode = (CheckBoxNode) rootNode.getChildAt(i);
             Breakpoint b = (Breakpoint) checkBoxNode.getUserObject();
-            if (b.getID() == breakpoint.getID()) {
+
+            if (b.equals(breakpoint)) {
                 checkBoxNode.setUserObject(breakpoint);
+
                 if (checkBoxNode.isSelected()) {
                     debugger.addBreakpoint(breakpoint);
                 }
+
                 break;
             }
         }
diff --git a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/ClientDebugger.java b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/ClientDebugger.java
index eea3dfe7bb..6418f203a5 100644
--- a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/ClientDebugger.java
+++ b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/ClientDebugger.java
@@ -111,7 +111,7 @@ class ClientDebugger implements Debugger {
             }
 
             for (int i = 0; i < breakpoints.length; i++) {
-                if (breakpoints[i].getID() == breakpoint.getID()) {
+                if (breakpoints[i].equals(breakpoint)) {
                     breakpoints[i] = breakpoint;
                     comm.asyncSend(new CMS_addBreakpoint(breakpoint));
                     return;
@@ -130,14 +130,15 @@ class ClientDebugger implements Debugger {
     @Override
     public void removeBreakpoint(Breakpoint breakpoint) {
         synchronized (BREAKPOINT_LOCK) {
-            if(this.breakpoints == null) {
+            if (this.breakpoints == null) {
                 return;
             }
-            for(int i=0; i<breakpoints.length; i++) {
-                if(breakpoints[i].getID() == breakpoint.getID()) {
-                    if(breakpoints.length == 1) {
+            for (int i = 0; i < breakpoints.length; i++) {
+                if (breakpoints[i].equals(breakpoint)) {
+                    if (breakpoints.length == 1) {
                         breakpoints = null;
-                    } else {
+                    }
+                    else {
                         Breakpoint[] newBreakpoints = new Breakpoint[breakpoints.length - 1];
                         System.arraycopy(breakpoints, 0, newBreakpoints, 0, i);
                         System.arraycopy(breakpoints, i + 1, newBreakpoints, i, newBreakpoints.length - i);
diff --git a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalDebugger.java b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalDebugger.java
index f3fc504cc1..7027e88507 100644
--- a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalDebugger.java
+++ b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalDebugger.java
@@ -106,7 +106,7 @@ class LocalDebugger implements Debugger {
             }
 
             for (int i = 0; i < breakpoints.length; i++) {
-                if (breakpoints[i].getID() == breakpoint.getID()) {
+                if (breakpoints[i].equals(breakpoint)) {
                     breakpoints[i] = breakpoint;
                     return;
                 }
@@ -122,14 +122,15 @@ class LocalDebugger implements Debugger {
     @Override
     public void removeBreakpoint(Breakpoint breakpoint) {
         synchronized (BREAKPOINT_LOCK) {
-            if(this.breakpoints == null) {
+            if (this.breakpoints == null) {
                 return;
             }
-            for(int i=0; i<breakpoints.length; i++) {
-                if(breakpoints[i].getID() == breakpoint.getID()) {
-                    if(breakpoints.length == 1) {
+            for (int i = 0; i < breakpoints.length; i++) {
+                if (breakpoints[i].equals(breakpoint)) {
+                    if (breakpoints.length == 1) {
                         breakpoints = null;
-                    } else {
+                    }
+                    else {
                         Breakpoint[] newBreakpoints = new Breakpoint[breakpoints.length - 1];
                         System.arraycopy(breakpoints, 0, newBreakpoints, 0, i);
                         System.arraycopy(breakpoints, i + 1, newBreakpoints, i, newBreakpoints.length - i);