diff --git a/OpenCL/m03200.cl b/OpenCL/m03200.cl
index b7309ecd5..3a19a2bae 100644
--- a/OpenCL/m03200.cl
+++ b/OpenCL/m03200.cl
@@ -383,6 +383,8 @@ void expand_key (u32 E[18], const u32 W[16], const u32 len)
     while (W_cur < W_stop)
     {
       *E_cur++ = *W_cur++;
+
+      if (E_cur == E_stop) return;
     }
 
     *E_cur++ = 0;
diff --git a/docs/changes.txt b/docs/changes.txt
index 9de068e39..8ee60fc3f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -52,6 +52,7 @@
 - Fixed DEScrypt cracking in BF mode in case the hashlist contains more than 16 times the same salt
 - Fixed duplicate detection for WPA handshakes with the same ESSID
 - Fixed nvapi datatype definition for NvS32 and NvU32
+- Fixed overflow in bcrypt kernel in expand_key() function
 - Fixed pointer to local variable outside scope in case -j or -k is used
 - Fixed pointer to local variable outside scope in case --markov-hcstat is not used
 - Fixed recursion in loopback handling when session was aborted by the user