diff --git a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
index 4ee7691..6532aff 100644
--- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
+++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
@@ -106,6 +106,14 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "m6502_dbg_bp_search:6502_bp.c">
+         <PersistentStrings>
+            <PersistentString
+               value = "breakpoints">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "HiRes.draw(_:):HiRes.swift">
          <PersistentStrings>
@@ -286,6 +294,9 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "m6502_dbg_bp_compact:6502_bp.c">
+      </ContextState>
       <ContextState
          contextName = "ViewController.Reset(_:):ViewController.swift">
          <PersistentStrings>
diff --git a/src/cpu/6502_bp.c b/src/cpu/6502_bp.c
index e4926f4..81ac674 100644
--- a/src/cpu/6502_bp.c
+++ b/src/cpu/6502_bp.c
@@ -80,11 +80,11 @@ void m6502_dbg_bp_sort( uint16_t arr[], int first, int last ) {
 }
 
 
-/// A recursive binary search function. It returns
+/// A binary search function. It returns
 /// location of addr in given array arr[l..r] is present,
 /// otherwise -1
 int m6502_dbg_bp_search(uint16_t arr[], int l, int r, uint16_t addr) {
-    if ( (r >= l) && (addr >= arr[l]) && (addr <= arr[r]) ) {
+    while ( r >= l ) {
         int mid = (l + r) / 2;
 
         // found it
@@ -93,12 +93,14 @@ int m6502_dbg_bp_search(uint16_t arr[], int l, int r, uint16_t addr) {
         }
 
         // maybe in the left side?
-        if (arr[mid] > addr) {
-            return m6502_dbg_bp_search(arr, l, mid - 1, addr);
+        else if (arr[mid] > addr) {
+            r = mid - 1;
         }
 
         // maybe in the right side?
-        return m6502_dbg_bp_search(arr, mid + 1, r, addr);
+        else {
+            l = mid + 1;
+        }
     }
 
     // addr not found
@@ -177,8 +179,8 @@ int m6502_dbg_bp_get_not_empty() {
 /// move array down to eliminate
 void m6502_dbg_bp_compact() {
     int i = m6502_dbg_bp_get_not_empty();
-    memcpy(breakpoints, breakpoints + i, bp_last_idx);
-    memset(breakpoints + bp_last_idx + 1, 0, DEBUG_MAX_BREAKPOINTS - bp_last_idx - 1);
+    memcpy(breakpoints, breakpoints + i, bp_last_idx * sizeof(uint16_t));
+    memset(breakpoints + bp_last_idx, 0, (DEBUG_MAX_BREAKPOINTS - bp_last_idx) * sizeof(uint16_t));
     bp_last_idx = m6502_dbg_bp_get_last(bp_last_idx);
 }