diff --git a/docs/changes.txt b/docs/changes.txt
index d48f1c3db..78b2da7a3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -95,6 +95,10 @@ Type.: Bug
 File.: Kernel
 Desc.: Fix a bug in the implementation of GOST R 34.11-94, zero length passwords were not cracked
 
+Type.: Bug
+File.: Kernel
+Desc.: Fix a bug in rule-engine for NVidia devices, the code for left- and right-shift were switched
+
 Type.: Bug
 File.: Host
 Desc.: Forced default iteration count for -m 2100 = DCC2 hashes to 10240
diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 59d77caef..d03d6967d 100644
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -1567,9 +1567,7 @@ static void status_benchmark ()
   u64   speed_cnt[DEVICES_MAX];
   float speed_ms[DEVICES_MAX];
 
-  uint device_id;
-
-  for (device_id = 0; device_id < data.devices_cnt; device_id++)
+  for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
   {
     hc_device_param_t *device_param = &data.devices_param[device_id];
 
@@ -3962,6 +3960,8 @@ static void *thread_calc_stdin (void *p)
 {
   hc_device_param_t *device_param = (hc_device_param_t *) p;
 
+  if (device_param->skipped) return NULL;
+
   const uint attack_kern = data.attack_kern;
 
   const uint kernel_blocks = device_param->kernel_blocks;
@@ -4174,6 +4174,8 @@ static void *thread_calc (void *p)
 {
   hc_device_param_t *device_param = (hc_device_param_t *) p;
 
+  if (device_param->skipped) return NULL;
+
   const uint attack_mode = data.attack_mode;
   const uint attack_kern = data.attack_kern;
 
@@ -16012,8 +16014,6 @@ int main (int argc, char **argv)
         {
           hc_device_param_t *device_param = &devices_param[device_id];
 
-          if (device_param->skipped) continue;
-
           if (wordlist_mode == WL_MODE_STDIN)
           {
             hc_thread_create (c_threads[device_id], thread_calc_stdin, device_param);