diff --git a/servers/slapd/back-mdb/idl.c b/servers/slapd/back-mdb/idl.c
index eee2afc670..9260d2be9a 100644
--- a/servers/slapd/back-mdb/idl.c
+++ b/servers/slapd/back-mdb/idl.c
@@ -1074,7 +1074,7 @@ mdb_idl_sort( ID *ids, ID *tmp )
 			ids[l+1] = ids[j];
 			ids[j] = a;
 			jstack += 2;
-			if (ir-i+1 >= j-1) {
+			if (ir-i+1 >= j-l) {
 				istack[jstack] = ir;
 				istack[jstack-1] = i;
 				ir = j-1;
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 7b82133dd8..caa67464a8 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -800,7 +800,7 @@ slap_sort_vals(
 				break;
 			EXCH(l+1,j);
 			jstack += 2;
-			if (ir-i+1 >= j) {
+			if (ir-i+1 > j-l) {
 				istack[jstack] = ir;
 				istack[jstack-1] = i;
 				ir = j;