diff --git a/OpenCL/m22400-pure.cl b/OpenCL/m22400-pure.cl
index 4df18501a..1966be697 100644
--- a/OpenCL/m22400-pure.cl
+++ b/OpenCL/m22400-pure.cl
@@ -73,9 +73,9 @@ KERNEL_FQ void m22400_init (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t))
   #ifdef _unroll
   #pragma unroll
   #endif
-  for (int i = 127; i >= 0; i--) // create some space for the first digest without extra buffer
+  for (int i = 80 - 1; i >= 8; i--) // create some space for the first digest without extra buffer
   {
-    w[8 + i] = w[i];
+    w[i] = w[i - 8];
   }
 
   w[0] = ctx.h[0];
diff --git a/docs/changes.txt b/docs/changes.txt
index ead11b7a1..24980e1ff 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -17,6 +17,7 @@
 - Fixed invalid handling of initialization value for -m 11500
 - Fixed invalid progress counter initialization in attack-mode 9 when using --skip or --restore
 - Fixed out-of-boundary reads in attack-mode 9 that were caused by a missing work item limit in the refactored autotune engine
+- Fixed out-of-boundary reads in hash-mode 22400 (AES Crypt) kernel
 - Fixed strategy for eliminating hashes with zero length in LM when multiple hashes contain a zero hash
 
 ##