diff --git a/OpenCL/m24300_a1-optimized.cl b/OpenCL/m24300_a1-optimized.cl
index a983e4af4..21c3ce379 100644
--- a/OpenCL/m24300_a1-optimized.cl
+++ b/OpenCL/m24300_a1-optimized.cl
@@ -237,7 +237,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ())
     u32x wb_t = hc_swap32 (w2[3]);
     u32x wc_t = hc_swap32 (w3[0]);
     u32x wd_t = hc_swap32 (w3[1]);
-    u32x we_t = 0;
+    u32x we_t = hc_swap32 (w3[2]);
     u32x wf_t = out_salt_len * 8;
 
     u32x a = SHA1M_A;
@@ -920,7 +920,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ())
     u32x wb_t = hc_swap32 (w2[3]);
     u32x wc_t = hc_swap32 (w3[0]);
     u32x wd_t = hc_swap32 (w3[1]);
-    u32x we_t = 0;
+    u32x we_t = hc_swap32 (w3[2]);
     u32x wf_t = out_salt_len * 8;
 
     u32x a = SHA1M_A;
diff --git a/OpenCL/m24300_a3-optimized.cl b/OpenCL/m24300_a3-optimized.cl
index 02bc6ab6a..24ec2c772 100644
--- a/OpenCL/m24300_a3-optimized.cl
+++ b/OpenCL/m24300_a3-optimized.cl
@@ -138,7 +138,7 @@ DECLSPEC void m24300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
     u32x wb_t = w2[3];
     u32x wc_t = w3[0];
     u32x wd_t = w3[1];
-    u32x we_t = 0;
+    u32x we_t = w3[2];
     u32x wf_t = pw_salt_len * 8;
     
 
@@ -715,30 +715,8 @@ DECLSPEC void m24300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
     u32x wb_t = w2[3];
     u32x wc_t = w3[0];
     u32x wd_t = w3[1];
-    u32x we_t = 0;
+    u32x we_t = w3[2];
     u32x wf_t = pw_salt_len * 8;
-
-    /*
-    if (gid == 0 && lid == 0)
-    {
-      printf("\n%08x", w0_t[0]);
-      printf("\n%08x", w1_t[0]);
-      printf("\n%08x", w2_t[0]);
-      printf("\n%08x", w3_t[0]);
-      printf("\n%08x", w4_t[0]);
-      printf("\n%08x", w5_t[0]);
-      printf("\n%08x", w6_t[0]);
-      printf("\n%08x", w7_t[0]);
-      printf("\n%08x", w8_t[0]);
-      printf("\n%08x", w9_t[0]);
-      printf("\n%08x", wa_t[0]);
-      printf("\n%08x", wb_t[0]);
-      printf("\n%08x", wc_t[0]);
-      printf("\n%08x", wd_t[0]);
-      printf("\n%08x", we_t[0]);
-      printf("\n%08x\n", wf_t[0]);
-    }
-    */
     
 
     u32x a = SHA1M_A;
@@ -1084,27 +1062,6 @@ DECLSPEC void m24300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
     we_t = 0;
     wf_t = (salt_len + 40) * 8;
 
-
-    if (gid == 0 && lid == 0)
-    {
-      printf("\n%08x", w0_t[0]);
-      printf("\n%08x", w1_t[0]);
-      printf("\n%08x", w2_t[0]);
-      printf("\n%08x", w3_t[0]);
-      printf("\n%08x", w4_t[0]);
-      printf("\n%08x", w5_t[0]);
-      printf("\n%08x", w6_t[0]);
-      printf("\n%08x", w7_t[0]);
-      printf("\n%08x", w8_t[0]);
-      printf("\n%08x", w9_t[0]);
-      printf("\n%08x", wa_t[0]);
-      printf("\n%08x", wb_t[0]);
-      printf("\n%08x", wc_t[0]);
-      printf("\n%08x", wd_t[0]);
-      printf("\n%08x", we_t[0]);
-      printf("\n%08x\n", wf_t[0]);
-    }
-
     #undef K
     #define K SHA1C00