diff --git a/rho/scancommand.py b/rho/scancommand.py
index b7d3610..2907a84 100644
--- a/rho/scancommand.py
+++ b/rho/scancommand.py
@@ -464,7 +464,7 @@ def _validate_options(self):
         elif facts == ['all']:
             self.facts_to_collect = list(utilities.ALL_FACTS)
         elif facts == ['jboss']:
-            self.facts_to_collect = list(utilities.JBOSS_FACTS +
+            self.facts_to_collect = list(utilities.JBOSS_FACTS_TUPLE +
                                          utilities.CONNECTION_FACTS_TUPLE)
         elif facts == ['rhel']:
             self.facts_to_collect = list(utilities.RHEL_FACTS +
diff --git a/rho/utilities.py b/rho/utilities.py
index 8445030..2ef1605 100644
--- a/rho/utilities.py
+++ b/rho/utilities.py
@@ -136,11 +136,10 @@
     + CPU_FACTS_TUPLE + SYSID_FACTS_TUPLE + INSTNUM_FACTS_TUPLE \
     + REDHAT_RELEASE_FACTS_TUPLE + UNAME_FACTS_TUPLE
 
-JBOSS_FACTS = JBOSS_FACTS_TUPLE + BRMS_FACTS_TUPLE + FUSE_FACTS_TUPLE
+DEFAULT_FACTS = RHEL_FACTS + JBOSS_FACTS_TUPLE + CONNECTION_FACTS_TUPLE
 
-DEFAULT_FACTS = RHEL_FACTS + JBOSS_FACTS + CONNECTION_FACTS_TUPLE
-
-ALL_FACTS = DEFAULT_FACTS + JBOSS_SCAN_FACTS_TUPLE
+ALL_FACTS = DEFAULT_FACTS + JBOSS_SCAN_FACTS_TUPLE + BRMS_FACTS_TUPLE \
+    + FUSE_FACTS_TUPLE
 
 # 'log' is a convenience for getting the appropriate logger from the
 # logging module. Use it like this: