diff --git a/OpenCL/m24800_a0-pure.cl b/OpenCL/m24800_a0-pure.cl
index 54ae82f8c..3c2674424 100644
--- a/OpenCL/m24800_a0-pure.cl
+++ b/OpenCL/m24800_a0-pure.cl
@@ -52,9 +52,9 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_RULES ())
     u32 t[128] = { 0 };
 
     // make it unicode.
-    for (u32 i = 0, idx = 0; i < tmp.pw_len; i += 4, idx += 1)
+    for (u32 i = 0, idx = 0; i < tmp.pw_len; i += 16, idx += 4)
     {
-      make_utf16beN (&tmp.i[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 1]);
+      make_utf16beN (&tmp.i[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 4]);
     }
 
     // hash time
@@ -123,9 +123,9 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_RULES ())
     u32 t[128] = { 0 };
 
     // make it unicode.
-    for (u32 i = 0, idx = 0; i < tmp.pw_len; i += 4, idx += 1)
+    for (u32 i = 0, idx = 0; i < tmp.pw_len; i += 16, idx += 4)
     {
-      make_utf16beN (&tmp.i[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 1]);
+      make_utf16beN (&tmp.i[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 4]);
     }
 
     // hash time
diff --git a/OpenCL/m24800_a1-pure.cl b/OpenCL/m24800_a1-pure.cl
index 7782975f1..c37c859ff 100644
--- a/OpenCL/m24800_a1-pure.cl
+++ b/OpenCL/m24800_a1-pure.cl
@@ -69,9 +69,9 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_BASIC ())
     u32 t[128] = { 0 };
 
     // make it unicode.
-    for (u32 i = 0, idx = 0; i < pw_len + comb_len; i += 4, idx += 1)
+    for (u32 i = 0, idx = 0; i < pw_len + comb_len; i += 16, idx += 4)
     {
-      make_utf16beN (&c[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 1]);
+      make_utf16beN (&c[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 4]);
     }
 
     sha1_hmac_ctx_t ctx;
@@ -158,9 +158,9 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_BASIC ())
     u32 t[128] = { 0 };
 
     // make it unicode.
-    for (u32 i = 0, idx = 0; i < pw_len + comb_len; i += 4, idx += 1)
+    for (u32 i = 0, idx = 0; i < pw_len + comb_len; i += 16, idx += 4)
     {
-      make_utf16beN (&c[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 1]);
+      make_utf16beN (&c[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 4]);
     }
 
     sha1_hmac_ctx_t ctx;
diff --git a/OpenCL/m24800_a3-pure.cl b/OpenCL/m24800_a3-pure.cl
index 51d78beb9..055e7f2e0 100644
--- a/OpenCL/m24800_a3-pure.cl
+++ b/OpenCL/m24800_a3-pure.cl
@@ -55,9 +55,9 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_VECTOR ())
     u32x t[128] = { 0 };
 
     // make it unicode.
-    for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+    for (u32 i = 0, idx = 0; i < pw_len; i += 16, idx += 4)
     {
-      make_utf16beN (&w[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 1]);
+      make_utf16beN (&w[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 4]);
     }
 
     sha1_hmac_ctx_vector_t ctx;
@@ -130,9 +130,9 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_VECTOR ())
     u32x t[128] = { 0 };
 
     // make it unicode.
-    for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+    for (u32 i = 0, idx = 0; i < pw_len; i += 16, idx += 4)
     {
-      make_utf16beN (&w[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 1]);
+      make_utf16beN (&w[idx], &t[(idx * 2) + 0], &t[(idx * 2) + 4]);
     }
 
     sha1_hmac_ctx_vector_t ctx;