diff --git a/deps/OpenCL-Headers/CL b/deps/OpenCL-Headers/CL
index bf0f43b76..42e7afe06 160000
--- a/deps/OpenCL-Headers/CL
+++ b/deps/OpenCL-Headers/CL
@@ -1 +1 @@
-Subproject commit bf0f43b76f4556c3d5717f8ba8a01216b27f4af7
+Subproject commit 42e7afe066a67107c2236b86c9864a472f8eead8
diff --git a/docs/changes.txt b/docs/changes.txt
index bb2dc675a..fd140375c 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -10,6 +10,7 @@
 - Add a tracker for salts, amplifier and iterations to status screen
 - Add option --markov-hcstat2 to make it clear that the new hcstat2 format (compressed hcstat2gen output) must be used
 - Do not allocate memory segments for bitmap tables if we dont need it, for example in benchmark mode
+- Removed duplicate words in the dictionary file example.dict
 
 ##
 ## Bugs
@@ -19,8 +20,8 @@
 - Fixed a problem with attack mode -a 7 together with stdout mode where the mask bytes were missing in the output
 - Fixed a problem with tab completion where --self-test-disable did incorrecly expect a further parameter/value
 - Fixed the ciphertext max length in Ansible Vault parser
+- Fixed detection of unique ESSID in WPA-PMKID-* parser
 - Fixed speed/delay problem when quitting while the outfile folder is being scanned
-- Removed duplicate words in the dictionary file example.dict
 
 * changes v4.2.0 -> v4.2.1
 
diff --git a/src/interface.c b/src/interface.c
index 206c88c58..52ef6a37a 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -17647,16 +17647,10 @@ int wpa_pmkid_pbkdf2_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf,
 
   // salt
 
-  salt->salt_buf[0] = wpa_pmkid->pmkid_data[0];
-  salt->salt_buf[1] = wpa_pmkid->pmkid_data[1];
-  salt->salt_buf[2] = wpa_pmkid->pmkid_data[2];
-  salt->salt_buf[3] = wpa_pmkid->pmkid_data[3];
-  salt->salt_buf[4] = wpa_pmkid->pmkid_data[4];
-  salt->salt_buf[5] = wpa_pmkid->pmkid_data[5];
-  salt->salt_buf[6] = wpa_pmkid->pmkid_data[6];
-  salt->salt_buf[7] = wpa_pmkid->pmkid_data[7];
+  memcpy (salt->salt_buf, wpa_pmkid->essid_buf, wpa_pmkid->essid_len);
+
+  salt->salt_len = wpa_pmkid->essid_len;
 
-  salt->salt_len  = 32;
   salt->salt_iter = ROUNDS_WPA_PBKDF2 - 1;
 
   // hash