diff --git a/OpenCL/m17200_a0-pure.cl b/OpenCL/m17200_a0-pure.cl
index 621062b8c..b5ab902aa 100644
--- a/OpenCL/m17200_a0-pure.cl
+++ b/OpenCL/m17200_a0-pure.cl
@@ -951,8 +951,8 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
       update_key012 (key0, key1, key2, plain, l_crc32tab);
     }
 
-    if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
-    if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
+    if (esalt_bufs[digests_offset].hash.data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
+    if (esalt_bufs[digests_offset].hash.data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
 
     mz_stream infstream;
 
diff --git a/OpenCL/m17200_a1-pure.cl b/OpenCL/m17200_a1-pure.cl
index 4672e3dfa..79b91878a 100644
--- a/OpenCL/m17200_a1-pure.cl
+++ b/OpenCL/m17200_a1-pure.cl
@@ -957,8 +957,8 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
       update_key012 (key0, key1, key2, plain, l_crc32tab);
     }
 
-    if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
-    if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
+    if (esalt_bufs[digests_offset].hash.data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
+    if (esalt_bufs[digests_offset].hash.data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
 
     mz_stream infstream;
 
diff --git a/OpenCL/m17200_a3-pure.cl b/OpenCL/m17200_a3-pure.cl
index d6a08271b..3c2d7200c 100644
--- a/OpenCL/m17200_a3-pure.cl
+++ b/OpenCL/m17200_a3-pure.cl
@@ -982,8 +982,8 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
       update_key012 (key0, key1, key2, plain, l_crc32tab);
     }
 
-    if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
-    if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
+    if (esalt_bufs[digests_offset].hash.data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
+    if (esalt_bufs[digests_offset].hash.data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
 
     mz_stream infstream;
 
diff --git a/OpenCL/m17220_a0-pure.cl b/OpenCL/m17220_a0-pure.cl
index c33aa288d..502c0ed9b 100644
--- a/OpenCL/m17220_a0-pure.cl
+++ b/OpenCL/m17220_a0-pure.cl
@@ -721,8 +721,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
         update_key012 (key0, key1, key2, plain, l_crc32tab);
       }
 
-      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
-      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
 
       if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)
       {
@@ -986,8 +986,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
         update_key012 (key0, key1, key2, plain, l_crc32tab);
       }
 
-      if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
-      if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
 
       if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)
       {
diff --git a/OpenCL/m17220_a1-pure.cl b/OpenCL/m17220_a1-pure.cl
index bacb2fc65..f4efd14fa 100644
--- a/OpenCL/m17220_a1-pure.cl
+++ b/OpenCL/m17220_a1-pure.cl
@@ -721,8 +721,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t))
         update_key012 (key0, key1, key2, plain, l_crc32tab);
       }
 
-      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
-      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
 
       if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)
       {
@@ -988,8 +988,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t))
         update_key012 (key0, key1, key2, plain, l_crc32tab);
       }
 
-      if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
-      if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
 
       if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)
       {
diff --git a/OpenCL/m17220_a3-pure.cl b/OpenCL/m17220_a3-pure.cl
index 17379f3b1..488161baa 100644
--- a/OpenCL/m17220_a3-pure.cl
+++ b/OpenCL/m17220_a3-pure.cl
@@ -733,8 +733,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
         update_key012 (key0, key1, key2, plain, l_crc32tab);
       }
 
-      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue;
-      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     continue;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
 
       if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)
       {
@@ -1012,8 +1012,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
         update_key012 (key0, key1, key2, plain, l_crc32tab);
       }
 
-      if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
-      if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break;
+      if (esalt_bufs[digests_offset].hashes[idx].data_length >= 24 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp))     break;
 
       if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)
       {