diff --git a/OpenCL/m23500-pure.cl b/OpenCL/m23500-pure.cl
index d884b1821..202f94d67 100644
--- a/OpenCL/m23500-pure.cl
+++ b/OpenCL/m23500-pure.cl
@@ -31,7 +31,7 @@ typedef struct axcrypt2_tmp
   u64 out[8];
 
   u32 KEK[4];
-  u32 data[36];
+  u32 data[10];
 
 } axcrypt2_tmp_t;
 
@@ -371,7 +371,7 @@ KERNEL_FQ void m23500_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
   tmps[gid].KEK[2] = KEK[2] ^ salt[2];
   tmps[gid].KEK[3] = KEK[3] ^ salt[3];
 
-  for (int i = 0; i < 36; i++)
+  for (int i = 0; i < 10; i++)
   {
     tmps[gid].data[i] = esalt_bufs[digests_offset].data[i];
   }
@@ -447,9 +447,9 @@ KERNEL_FQ void m23500_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
   ukey[2] = tmps[gid].KEK[2];
   ukey[3] = tmps[gid].KEK[3];
 
-  u32 data[36];
+  u32 data[10];
 
-  for (int i = 0; i < 36; i++)
+  for (int i = 0; i < 10; i++)
   {
     data[i] = tmps[gid].data[i];
   }
@@ -492,7 +492,7 @@ KERNEL_FQ void m23500_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
     }
   }
 
-  for (int i = 0; i < 36; i++)
+  for (int i = 0; i < 10; i++)
   {
     tmps[gid].data[i] = data[i];
   }
diff --git a/OpenCL/m23600-pure.cl b/OpenCL/m23600-pure.cl
index ca94532ca..42e7f687b 100644
--- a/OpenCL/m23600-pure.cl
+++ b/OpenCL/m23600-pure.cl
@@ -31,7 +31,7 @@ typedef struct axcrypt2_tmp
   u64 out[8];
 
   u32 KEK[8];
-  u32 data[36];
+  u32 data[14];
 
 } axcrypt2_tmp_t;
 
@@ -383,7 +383,7 @@ KERNEL_FQ void m23600_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
   tmps[gid].KEK[6] = KEK[6] ^ salt[6];
   tmps[gid].KEK[7] = KEK[7] ^ salt[7];
 
-  for (int i = 0; i < 36; i++)
+  for (int i = 0; i < 14; i++)
   {
     tmps[gid].data[i] = esalt_bufs[digests_offset].data[i];
   }
@@ -463,9 +463,9 @@ KERNEL_FQ void m23600_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
   ukey[6] = tmps[gid].KEK[6];
   ukey[7] = tmps[gid].KEK[7];
 
-  u32 data[36];
+  u32 data[14];
 
-  for (int i = 0; i < 36; i++)
+  for (int i = 0; i < 14; i++)
   {
     data[i] = tmps[gid].data[i];
   }
@@ -508,7 +508,7 @@ KERNEL_FQ void m23600_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
     }
   }
 
-  for (int i = 0; i < 36; i++)
+  for (int i = 0; i < 14; i++)
   {
     tmps[gid].data[i] = data[i];
   }
diff --git a/src/modules/module_23500.c b/src/modules/module_23500.c
index c78ef23cd..5dd496d77 100644
--- a/src/modules/module_23500.c
+++ b/src/modules/module_23500.c
@@ -61,7 +61,7 @@ typedef struct axcrypt2_tmp
   u64 out[8];
 
   u32 KEK[4];
-  u32 data[36];
+  u32 data[10];
 
 } axcrypt2_tmp_t;
 
diff --git a/src/modules/module_23600.c b/src/modules/module_23600.c
index c27a39756..b94b7b9cc 100644
--- a/src/modules/module_23600.c
+++ b/src/modules/module_23600.c
@@ -61,7 +61,7 @@ typedef struct axcrypt2_tmp
   u64 out[8];
 
   u32 KEK[8];
-  u32 data[36];
+  u32 data[14];
 
 } axcrypt2_tmp_t;