diff --git a/src/builtin.c b/src/builtin.c
index dd4f5d0e34..f0680ebbd0 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -792,7 +792,7 @@ static jv f_bsearch(jq_state *jq, jv input, jv target) {
         return jv_number(-1);
     } else if (len == 1) {
         int result = jv_cmp(target, jv_array_get(input, 0));
-        if (result == 0 ) {
+        if (result == 0) {
             return jv_number(0);
         } else if (result > 0) {
             return jv_number(-2);
@@ -804,26 +804,26 @@ static jv f_bsearch(jq_state *jq, jv input, jv target) {
     int start = 0;
     int end = len - 1;
     jv answer = jv_null();
-    while (start <end) {
+    while (start <= end) {
         int mid = (start + end) / 2;
         int result = jv_cmp(jv_copy(target), jv_array_get(jv_copy(input), mid));
         if (result == 0) {
             answer = jv_number(mid);
             break;
-        } else if (start == end ) {
-            answer = jv_number(-1);
+        } else if (start == end) {
             break;
-        } else if (result < 0 ) {
-            end = mid -1;
+        } else if (result < 0) {
+            end = mid - 1;
         } else {
-            start = mid +1;
+            start = mid + 1;
         }
     }
+
     if (jv_get_kind(answer) == JV_KIND_NULL) {
         int result = jv_cmp(target, jv_array_get(jv_copy(input), start));
         if (result < 0) {
             answer =  jv_number(-1 - start);
-        }else {
+        } else {
             answer =  jv_number(-2 - start);
         }
     } else {
diff --git a/tests/jq.test b/tests/jq.test
index 18e1fdb401..dd8d5b94b6 100644
--- a/tests/jq.test
+++ b/tests/jq.test
@@ -1547,10 +1547,12 @@ ascii_upcase
 "useful but not for é"
 "USEFUL BUT NOT FOR é"
 
-bsearch(0,2,4)
+bsearch(0,1,2,3,4)
 [1,2,3]
 -1
+0
 1
+2
 -4
 
 bsearch({x:1})