diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl
index 570f600c8..3610a2875 100644
--- a/OpenCL/m10700-optimized.cl
+++ b/OpenCL/m10700-optimized.cl
@@ -653,7 +653,7 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
   w0[2] = pws[gid].i[2];
   w0[3] = pws[gid].i[3];
 
-  const u32 pw_len = pws[gid].pw_len & 63;
+  const u32 pw_len = pws[gid].pw_len & 31;
 
   if (pw_len == 0) return;
 
diff --git a/docs/changes.txt b/docs/changes.txt
index afe58c547..2816c9ec6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -49,6 +49,7 @@
 - Fixed Unit Test salt-max in case of optimized kernel, with hash-type 22 and 23
 - Fixed wordlist handling in -m 3000 when candidate passwords use the $HEX[...] syntax
 - Fixed display problem of the "Optimizers applied" list for algorithms using Register-Limit
+- Fixed password limit in optimized kernel for hash-mode 10700
 
 ##
 ## Technical