diff --git a/lib/modules/fingerprints/__init__.py b/lib/modules/fingerprints/__init__.py
index 592eefc..888ac50 100644
--- a/lib/modules/fingerprints/__init__.py
+++ b/lib/modules/fingerprints/__init__.py
@@ -23,6 +23,7 @@ class Fingerprints:
     def __init__(self, agent, proxy, redirect, timeout, url, cookie):
         self.url = url
         self.cookie = cookie
+        self.redirect=redirect
         self.output = Services.get("output")
         self.request = Services.get("request_factory")
 
@@ -43,6 +44,7 @@ def run(self, plugins_activated):
                 url=self.url,
                 method="GET",
                 payload=None,
+                redirect=self.redirect,
                 headers=None,
                 cookies=self.cookie,
             )
diff --git a/lib/modules/fingerprints/waf/__init__.py b/lib/modules/fingerprints/waf/__init__.py
index af6cdd0..0bb22b8 100644
--- a/lib/modules/fingerprints/waf/__init__.py
+++ b/lib/modules/fingerprints/waf/__init__.py
@@ -1,3 +1,7 @@
-from lib.utils.output import Output
+from lib.utils.container import Services
 
-Output().info("For better waf detection we recommend you to run with --no-redirect")
+output = Services.get("output")
+request = Services.get("request_factory")
+
+if request.redirect == True:
+    output.info("For better waf detection we recommend you to run with --no-redirect")
diff --git a/lib/request/request.py b/lib/request/request.py
index 8e8c53f..f4a34fc 100644
--- a/lib/request/request.py
+++ b/lib/request/request.py
@@ -7,9 +7,6 @@
 from . import ragent as ragent
 from lib.utils.container import Services
 
-
-# TODO Replace requests with Octopus-http to parallel the requests
-# @ref https://github.com/heynemann/octopus
 # Create a RequestFactory with getSingleRequest, getParallelRequests+enqueue
 class SingleRequest:
     def __init__(self, **kwargs):