diff --git a/tasks/main.yml b/tasks/main.yml
index ab62b25..f9459ab 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,9 +2,9 @@
 - name: Refresh setup facts
   setup:
 
-- name: Report selinux status
-  debug:
-    var: ansible_selinux.status
+#- name: Report selinux status
+#  debug:
+#    var: ansible_selinux.status
 
 - name: Indicate whether selinux is disabled
   cache:
@@ -13,9 +13,10 @@
 
 - name: Permanently disable SELINUX
   selinux: state=disabled
-  when: selinux_disabled == 'false'
+  when:  ansible_selinux.status == 'enabled'
+  register: selinux_disabled
 
 - name: Restart node
   debug:
     msg: 'SELinux MUST be disabled, selinux has been updated, please restart node now...'
-  when: selinux_disabled == 'false'
+  when: selinux_disabled.changed