diff --git a/LeopardFF8.cpp b/LeopardFF8.cpp
index 4d4da4a..4d0adfc 100644
--- a/LeopardFF8.cpp
+++ b/LeopardFF8.cpp
@@ -964,7 +964,7 @@ void ReedSolomonEncode(
             const unsigned range = width << 1;
 
 #ifdef LEO_SCHEDULE_OPT
-            const unsigned stop = ((last_count + width - 1) >> shift) << shift;
+            const unsigned stop = ((last_count + range - 1) >> shift) << shift;
             for (unsigned j = width; j < stop; j += range)
 #else
             for (unsigned j = width; j < m; j += range)
diff --git a/tests/benchmark.cpp b/tests/benchmark.cpp
index ef1c59e..112c4de 100644
--- a/tests/benchmark.cpp
+++ b/tests/benchmark.cpp
@@ -46,10 +46,10 @@ struct TestParameters
     unsigned recovery_count = 100; // under 65536 - original_count
 #else
     unsigned original_count = 3; // under 65536
-    unsigned recovery_count = 2; // under 65536 - original_count
+    unsigned recovery_count = 3; // under 65536 - original_count
 #endif
     unsigned buffer_bytes = 64000; // multiple of 64 bytes
-    unsigned loss_count = 2; // some fraction of original_count
+    unsigned loss_count = 3; // some fraction of original_count
     unsigned seed = 0;
     bool multithreaded = true;
 };