diff --git a/include/types.h b/include/types.h
index 6afd57f56..a0af2af97 100644
--- a/include/types.h
+++ b/include/types.h
@@ -973,7 +973,6 @@ typedef struct
   u32     force;
   u32     hex_charset;
   u32     hex_salt;
-  u32     hex_wordlist;
   u32     pw_min;
   u32     pw_max;
 
diff --git a/include/wordlist.h b/include/wordlist.h
index f3582d30b..e886d36d2 100644
--- a/include/wordlist.h
+++ b/include/wordlist.h
@@ -6,7 +6,7 @@
 #ifndef _WORDLIST_H
 #define _WORDLIST_H
 
-uint convert_from_hex (char *line_buf, const uint line_len);
+uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options);
 
 void load_segment (wl_data_t *wl_data, FILE *fd);
 
diff --git a/src/dispatch.c b/src/dispatch.c
index aa5e0972c..a6d21d866 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -146,7 +146,7 @@ void *thread_calc_stdin (void *p)
 
       uint line_len = in_superchop (line_buf);
 
-      line_len = convert_from_hex (line_buf, line_len);
+      line_len = convert_from_hex (line_buf, line_len, user_options);
 
       // post-process rule engine
 
@@ -381,7 +381,7 @@ void *thread_calc (void *p)
         {
           get_next_word (wl_data, user_options, user_options_extra, fd, &line_buf, &line_len);
 
-          line_len = convert_from_hex (line_buf, line_len);
+          line_len = convert_from_hex (line_buf, line_len, user_options);
 
           // post-process rule engine
 
diff --git a/src/hashcat.c b/src/hashcat.c
index eb38e4af7..bee9952ce 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -274,7 +274,6 @@ int main (int argc, char **argv)
     data.force = user_options->force;
     data.hex_charset = user_options->hex_charset;
     data.hex_salt = user_options->hex_salt;
-    data.hex_wordlist = user_options->hex_wordlist;
     data.logfile_disable = user_options->logfile_disable;
     data.quiet = user_options->quiet;
 
diff --git a/src/opencl.c b/src/opencl.c
index 01ff07288..ea17a5e02 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -1077,7 +1077,7 @@ int run_cracker (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, hash
 
           if (line_len >= PW_MAX1) continue;
 
-          line_len = convert_from_hex (line_buf, line_len);
+          line_len = convert_from_hex (line_buf, line_len, user_options);
 
           char *line_buf_new = line_buf;
 
diff --git a/src/wordlist.c b/src/wordlist.c
index dbc8ab796..6fb61c24c 100644
--- a/src/wordlist.c
+++ b/src/wordlist.c
@@ -37,11 +37,11 @@
 
 extern hc_global_data_t data;
 
-uint convert_from_hex (char *line_buf, const uint line_len)
+uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options)
 {
   if (line_len & 1) return (line_len); // not in hex
 
-  if (data.hex_wordlist == 1)
+  if (user_options->hex_wordlist == true)
   {
     uint i;
     uint j;