diff --git a/src/outfile.c b/src/outfile.c
index c24874342..8bb4b4624 100644
--- a/src/outfile.c
+++ b/src/outfile.c
@@ -85,10 +85,7 @@ int build_plain (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, pl
 
     plain_len += comb_len;
 
-    if (hashconfig->pw_max != PW_DICTMAX1)
-    {
-      if (plain_len > (int) hashconfig->pw_max) plain_len = (int) hashconfig->pw_max;
-    }
+    if (plain_len > (int) hashconfig->pw_max) plain_len = (int) hashconfig->pw_max;
   }
   else if (user_options->attack_mode == ATTACK_MODE_BF)
   {
@@ -130,10 +127,7 @@ int build_plain (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, pl
 
     plain_len += start + stop;
 
-    if (hashconfig->pw_max != PW_DICTMAX1)
-    {
-      if (plain_len > (int) hashconfig->pw_max) plain_len = (int) hashconfig->pw_max;
-    }
+    if (plain_len > (int) hashconfig->pw_max) plain_len = (int) hashconfig->pw_max;
   }
   else if (user_options->attack_mode == ATTACK_MODE_HYBRID2)
   {
@@ -161,10 +155,7 @@ int build_plain (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, pl
 
     plain_len += start + stop;
 
-    if (hashconfig->pw_max != PW_DICTMAX1)
-    {
-      if (plain_len > (int) hashconfig->pw_max) plain_len = (int) hashconfig->pw_max;
-    }
+    if (plain_len > (int) hashconfig->pw_max) plain_len = (int) hashconfig->pw_max;
   }
 
   if (user_options->attack_mode == ATTACK_MODE_BF)
diff --git a/src/stdout.c b/src/stdout.c
index 6f6d07803..bce6a24e6 100644
--- a/src/stdout.c
+++ b/src/stdout.c
@@ -138,7 +138,7 @@ int process_stdout (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
         plain_len = pw.pw_len;
 
         char *comb_buf = (char *) device_param->combs_buf[il_pos].i;
-        u32  comb_len =          device_param->combs_buf[il_pos].pw_len;
+        u32   comb_len =          device_param->combs_buf[il_pos].pw_len;
 
         if (combinator_ctx->combs_mode == COMBINATOR_MODE_BASE_LEFT)
         {
@@ -153,10 +153,7 @@ int process_stdout (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
 
         plain_len += comb_len;
 
-        if (hashconfig->pw_max != PW_DICTMAX1)
-        {
-          if (plain_len > hashconfig->pw_max) plain_len = hashconfig->pw_max;
-        }
+        if (plain_len > hashconfig->pw_max) plain_len = hashconfig->pw_max;
 
         out_push (&out, plain_ptr, plain_len);
       }
diff --git a/src/straight.c b/src/straight.c
index d1d5134a4..521fe56ea 100644
--- a/src/straight.c
+++ b/src/straight.c
@@ -229,9 +229,9 @@ int straight_ctx_init (hashcat_ctx_t *hashcat_ctx)
   {
     switch (user_options_extra->attack_kern)
     {
-      case ATTACK_KERN_STRAIGHT:  if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX1;
+      case ATTACK_KERN_STRAIGHT:  if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX;
                                   break;
-      case ATTACK_KERN_COMBI:     if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX1;
+      case ATTACK_KERN_COMBI:     if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX;
                                   break;
     }
   }
@@ -241,9 +241,9 @@ int straight_ctx_init (hashcat_ctx_t *hashcat_ctx)
     {
       switch (user_options_extra->attack_kern)
       {
-        case ATTACK_KERN_STRAIGHT:  if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX1;
+        case ATTACK_KERN_STRAIGHT:  if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX;
                                     break;
-        case ATTACK_KERN_COMBI:     if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX1;
+        case ATTACK_KERN_COMBI:     if (pw_max > PW_DICTMAX) pw_max = PW_DICTMAX;
                                     break;
       }
     }