diff --git a/docs/changes.txt b/docs/changes.txt
index 26cf12415..a5ad7d6ba 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -34,6 +34,7 @@
 ##
 
 - Fixed a missing type specifier in a function declaration of the RACF kernel
+- Fixed a condition that caused a hybrid attack using a maskfile to not select all wordlists from a wordlist folder
 
 ##
 ## Technical
diff --git a/src/hashcat.c b/src/hashcat.c
index 382a8fdce..604ee5f1b 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -368,7 +368,7 @@ static int inner1_loop (hashcat_ctx_t *hashcat_ctx)
       if (status_ctx->run_main_level3 == false) break;
     }
 
-    if (straight_ctx->dicts_pos == straight_ctx->dicts_cnt) straight_ctx->dicts_pos = 0;
+    if (straight_ctx->dicts_pos + 1 == straight_ctx->dicts_cnt) straight_ctx->dicts_pos = 0;
   }
   else
   {
@@ -767,7 +767,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
       if (status_ctx->run_main_level2 == false) break;
     }
 
-    if (mask_ctx->masks_pos == mask_ctx->masks_cnt) mask_ctx->masks_pos = 0;
+    if (mask_ctx->masks_pos + 1 == mask_ctx->masks_cnt) mask_ctx->masks_pos = 0;
   }
   else
   {