diff --git a/inspect-domains/files/inspect-domains.py b/inspect-domains/files/inspect-domains.py
index 35f7e410..e1120994 100755
--- a/inspect-domains/files/inspect-domains.py
+++ b/inspect-domains/files/inspect-domains.py
@@ -220,14 +220,14 @@ def main(argv):
         print('Domains not specified, looking for all domains (default).')
         args.all_domains = True
 
-    doms = []
+    doms = {}
    
     if args.all_domains:
-        doms.extend(list_apache_domains())
+        doms.update(list_apache_domains())
     
     else:
         if args.apache_domains:
-            doms.extend(list_apache_domains())
+            doms.update(list_apache_domains())
         if args.nginx_domains:
             print("Option --nginx-domains not supported yet.")
         if args.haproxy_domains:
@@ -243,7 +243,7 @@ def main(argv):
     
     timeout_domains, none_domains, outside_ips, ok_domains = run_check_domains(doms.keys())
     
-    if args.check:
+    if args.output_style == 'nrpe':
         output_check_mode(timeout_domains, none_domains, outside_ips, ok_domains)
     
     else:
diff --git a/nagios-nrpe/files/plugins/check_domains b/nagios-nrpe/files/plugins/check_domains
index 23f48022..78db2914 100755
--- a/nagios-nrpe/files/plugins/check_domains
+++ b/nagios-nrpe/files/plugins/check_domains
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 #
 # Check domains using script inspect-domains.
 #