diff --git a/OpenCL/m00670_a0.cl b/OpenCL/m00670_a0.cl
index 2665a32c5..93c6146f4 100644
--- a/OpenCL/m00670_a0.cl
+++ b/OpenCL/m00670_a0.cl
@@ -37,22 +37,6 @@ __kernel void m00670_m04 (__global pw_t *pws, __global const kernel_rule_t *rule
 
   const u32 pw_len = pws[gid].pw_len;
 
-  u32 iv[2];
-
-  iv[0] = esalt_bufs->iv[0];
-  iv[1] = esalt_bufs->iv[1];
-
-  u8 plain[64] = { 0 };
-  u32 plain_length = esalt_bufs->plain_length;
-  u32 position     = esalt_bufs->position;
-
-  for (int i = 0; i < plain_length; i++)
-  {
-    plain[i] = esalt_bufs->plain[i];
-  }
-
-  printf("position: %d, iv: %08x%08x, plain_length: %d, plain: %s\n", position, iv[0], iv[1], plain_length, plain);
-
   /**
    * loop
    */
@@ -112,21 +96,18 @@ __kernel void m00670_s04 (__global pw_t *pws, __global const kernel_rule_t *rule
 
   const u32 pw_len = pws[gid].pw_len;
 
-  u32 iv[2];
+  u32 iv[2]    = { 0 };
+  u32 plain[2] = { 0 };
+  u32 position = esalt_bufs->position;
+  u32 plain_length = esalt_bufs->plain_length;
 
   iv[0] = esalt_bufs->iv[0];
   iv[1] = esalt_bufs->iv[1];
 
-  u8 plain[64] = { 0 };
-  u32 plain_length = esalt_bufs->plain_length;
-  u32 position     = esalt_bufs->position;
-
-  for (int i = 0; i < plain_length; i++)
-  {
-    plain[i] = esalt_bufs->plain[i];
-  } 
-
-  printf("s04-> position: %d, iv: %08x%08x, plain_length: %d, plain: %s, cipher: %llu\n", position, iv[0], iv[1], plain_length, plain, digests_buf[digests_offset].digest_buf[0]);
+  plain[0] = esalt_bufs->plain[0];
+  plain[1] = esalt_bufs->plain[1];
+  
+  printf("s04-> position: %d, iv: %08x%08x, plain_length: %d, plain: %08x%08x, cipher: %08x%08x\n", position, iv[0], iv[1], plain_length, plain[0], plain[1], digests_buf[digests_offset].digest_buf[0], digests_buf[digests_offset].digest_buf[1]);
   
   /**
    * digest
diff --git a/chachaTest.hash b/chachaTest.hash
index 04c72e265..073813433 100644
--- a/chachaTest.hash
+++ b/chachaTest.hash
@@ -1 +1 @@
-$Chacha20$*1*0102030405060708*AAAAAAAAAAA=*E3C0fjxQmkM=
+$Chacha20$*1*0102030405060708*0000000000000000*1370b47e3c509a43
diff --git a/include/interface.h b/include/interface.h
index 25c7657bf..e56c61e36 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -912,8 +912,8 @@ typedef enum display_len
   DISPLAY_LEN_MAX_501   = 104,
   DISPLAY_LEN_MIN_600   = 8 + 128,
   DISPLAY_LEN_MAX_600   = 8 + 128,
-  DISPLAY_LEN_MIN_670   = 10 + 1 + 1 + 1 + 16 + 1 +  12 + 1 +  12,
-  DISPLAY_LEN_MAX_670   = 10 + 1 + 5 + 1 + 16 + 1 + 128 + 1 + 128,
+  DISPLAY_LEN_MIN_670   = 10 + 1 + 1 + 1 + 16 + 1 + 16 + 1 + 16,
+  DISPLAY_LEN_MAX_670   = 10 + 1 + 5 + 1 + 16 + 1 + 16 + 1 + 16,
   DISPLAY_LEN_MIN_900   = 32,
   DISPLAY_LEN_MAX_900   = 32,
   DISPLAY_LEN_MIN_910   = 32 + 1 + 0,
diff --git a/include/types.h b/include/types.h
index 93b2a0ec8..bdf401586 100644
--- a/include/types.h
+++ b/include/types.h
@@ -695,7 +695,7 @@ typedef struct
 typedef struct
 {
   u32 iv[2];
-  u8  plain[64];
+  u32 plain[2];
   u32 plain_length;
   u32 position;
 
diff --git a/src/interface.c b/src/interface.c
index 0068b38e5..c2873c1ae 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -5318,7 +5318,7 @@ int chacha20_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_U
 
   // if (is_valid_hex_string (input_buf + 8, 128) == false) return (PARSER_HASH_ENCODING);
 
-  u8 *digest = (u8 *) hash_buf->digest;
+  u32 *digest = (u32 *) hash_buf->digest;
 
   chacha20_t *chacha20 = (chacha20_t *) hash_buf->esalt;
 
@@ -5334,20 +5334,17 @@ int chacha20_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_U
   u8 *cipher_marker = (u8 *) strchr ((const char *) plain_marker, '*') + 1;
   if (cipher_marker == NULL) return (PARSER_SEPARATOR_UNMATCHED);
 
-  chacha20->position     = 1;
-  chacha20->plain_length = cipher_marker - plain_marker - 1;
-
-  for (int i = 0; i < chacha20->plain_length; i++)
-    chacha20->plain[i] = plain_marker[i];
+  chacha20->position = 1;
+  chacha20->plain_length = 16;
 
   chacha20->iv[0] = hex_to_u32 ((const u8 *) iv_marker + 8);
   chacha20->iv[1] = hex_to_u32 ((const u8 *) iv_marker + 0);
 
-  digest[0] = cipher_marker[ 0];
-  digest[1] = cipher_marker[ 1];
-  digest[2] = cipher_marker[ 2];
-  digest[3] = cipher_marker[ 3];
+  chacha20->plain[0] = hex_to_u32 ((const u8 *) plain_marker + 8);
+  chacha20->plain[1] = hex_to_u32 ((const u8 *) plain_marker + 0);
 
+  digest[0] = hex_to_u32 ((const u8 *) cipher_marker + 8);
+  digest[1] = hex_to_u32 ((const u8 *) cipher_marker + 0);
 
   return (PARSER_OK);
 }