diff --git a/Manual.org b/Manual.org
index b1cdd32..4b2906d 100644
--- a/Manual.org
+++ b/Manual.org
@@ -3198,12 +3198,10 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
 
     - name: use ubuntu-drivers to install additional drivers automatically
       command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
-  when:
-    - ansible_virtualization_type != "virtualbox"
-    - ansible_virtualization_role != "guest"
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_version != "16.04"  # ubuntu-drivers-common tries to autoinstall
-                                               # conflicting packages for virtualbox :(
+  when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or
+        ansible_distribution_version != "16.04"
+        # ubuntu-drivers-common tries to autoinstall
+        # conflicting packages for virtualbox in Ubuntu 16.04 :(
 #+END_SRC
 ** autoinstall-virtualbox-guest
 This role installs the guest additions for virtualbox guests on Ubuntu 16.04
diff --git a/roles/autoinstall-ubuntu-drivers/tasks/main.yml b/roles/autoinstall-ubuntu-drivers/tasks/main.yml
index dac22ae..131c8d1 100644
--- a/roles/autoinstall-ubuntu-drivers/tasks/main.yml
+++ b/roles/autoinstall-ubuntu-drivers/tasks/main.yml
@@ -10,9 +10,7 @@
 
     - name: use ubuntu-drivers to install additional drivers automatically
       command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
-  when:
-    - ansible_virtualization_type != "virtualbox"
-    - ansible_virtualization_role != "guest"
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_version != "16.04"  # ubuntu-drivers-common tries to autoinstall
-                                               # conflicting packages for virtualbox :(
+  when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or
+        ansible_distribution_version != "16.04"
+        # ubuntu-drivers-common tries to autoinstall
+        # conflicting packages for virtualbox in Ubuntu 16.04 :(