diff --git a/OpenCL/shared.cl b/OpenCL/shared.cl
index 4feddab6f..a6ae38988 100644
--- a/OpenCL/shared.cl
+++ b/OpenCL/shared.cl
@@ -229,7 +229,7 @@ KERNEL_FQ void gpu_utf8_to_utf16 (GLOBAL_AS pw_t *pws_buf, const u64 gid_max)
 
   hc_enc_init (&hc_enc);
 
-  pw_out.pw_len = hc_enc_next (&hc_enc, pw_in.i, pw_in.pw_len, 64, pw_out.i, 256);
+  pw_out.pw_len = hc_enc_next (&hc_enc, pw_in.i, pw_in.pw_len, 256, pw_out.i, 256);
 
   pws_buf[gid] = pw_out;
 }
diff --git a/src/modules/module_12500.c b/src/modules/module_12500.c
index 4210b4866..fda848e0a 100644
--- a/src/modules/module_12500.c
+++ b/src/modules/module_12500.c
@@ -101,7 +101,7 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con
 {
   const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
 
-  u32 pw_max = 64;
+  u32 pw_max = 128;
 
   if (optimized_kernel == true)
   {
diff --git a/src/modules/module_23700.c b/src/modules/module_23700.c
index 1d1f84a74..d3803b0eb 100644
--- a/src/modules/module_23700.c
+++ b/src/modules/module_23700.c
@@ -118,7 +118,7 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con
 {
   const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
 
-  u32 pw_max = 64;
+  u32 pw_max = 128;
 
   if (optimized_kernel == true)
   {
diff --git a/src/modules/module_23800.c b/src/modules/module_23800.c
index 1a9a551e1..f910b361f 100644
--- a/src/modules/module_23800.c
+++ b/src/modules/module_23800.c
@@ -401,7 +401,7 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con
 {
   const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
 
-  u32 pw_max = 64;
+  u32 pw_max = 128;
 
   if (optimized_kernel == true)
   {
diff --git a/tools/test_modules/m12500.pm b/tools/test_modules/m12500.pm
index 9e6729b9a..0c019ab9f 100644
--- a/tools/test_modules/m12500.pm
+++ b/tools/test_modules/m12500.pm
@@ -12,7 +12,7 @@ use Digest::SHA;
 use Crypt::CBC;
 use Encode;
 
-sub module_constraints { [[0, 64], [8, 8], [0, 20], [8, 8], [-1, -1]] }
+sub module_constraints { [[0, 128], [8, 8], [0, 20], [8, 8], [-1, -1]] }
 
 my $ITERATIONS = 0x40000;
 
diff --git a/tools/test_modules/m23700.pm b/tools/test_modules/m23700.pm
index eb0b4dbd2..f8dcc37cf 100644
--- a/tools/test_modules/m23700.pm
+++ b/tools/test_modules/m23700.pm
@@ -13,7 +13,7 @@ use Crypt::CBC;
 use Encode;
 use Digest::CRC qw (crc32);
 
-sub module_constraints { [[0, 64], [8, 8], [0, 20], [8, 8], [-1, -1]] }
+sub module_constraints { [[0, 128], [8, 8], [0, 20], [8, 8], [-1, -1]] }
 
 my $ITERATIONS = 0x40000;