diff --git a/fHDHR/device/tuners/stream/__init__.py b/fHDHR/device/tuners/stream/__init__.py
index 8df96ab..7250467 100644
--- a/fHDHR/device/tuners/stream/__init__.py
+++ b/fHDHR/device/tuners/stream/__init__.py
@@ -17,7 +17,7 @@ class Stream():
                 self.method = Direct_Stream(fhdhr, stream_args, tuner)
         else:
             plugin_name = self.fhdhr.config.dict["streaming"]["valid_methods"][stream_args["method"]]["plugin"]
-            self.method = self.fhdhr.plugins.plugins[plugin_name].Plugin_OBJ(self.fhdhr.plugins.plugins[plugin_name].plugin_utils, stream_args, tuner)
+            self.method = self.fhdhr.plugins.plugins[plugin_name].Plugin_OBJ(fhdhr, self.fhdhr.plugins.plugins[plugin_name].plugin_utils, stream_args, tuner)
 
     def get(self):
         return self.method.get()
diff --git a/fHDHR_web/api/m3u.py b/fHDHR_web/api/m3u.py
index f39054c..4d1449f 100644
--- a/fHDHR_web/api/m3u.py
+++ b/fHDHR_web/api/m3u.py
@@ -63,7 +63,7 @@ class M3U():
                         channel_items.append(channel_obj)
                     else:
                         return "Channel Disabled"
-            elif not origin and channel == "all" and str(channel) in [str(x) for x in self.fhdhr.device.channels.get_channel_list("id")]:
+            elif not origin and channel == "all":
                 fileName = "channels.m3u"
                 for origin in list(self.fhdhr.origins.origins_dict.keys()):
                     for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels(origin)]:
diff --git a/fHDHR_web/api/w3u.py b/fHDHR_web/api/w3u.py
index 390a01a..83fe0c4 100644
--- a/fHDHR_web/api/w3u.py
+++ b/fHDHR_web/api/w3u.py
@@ -61,7 +61,7 @@ class W3U():
                         channel_items.append(channel_obj)
                     else:
                         return "Channel Disabled"
-            elif not origin and channel == "all" and str(channel) in [str(x) for x in self.fhdhr.device.channels.get_channel_list("id")]:
+            elif not origin and channel == "all":
                 fileName = "channels.w3u"
                 for origin in list(self.fhdhr.origins.origins_dict.keys()):
                     for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels(origin)]:
diff --git a/plugins/fHDHR_plugin_stream_ffmpeg/__init__.py b/plugins/fHDHR_plugin_stream_ffmpeg/__init__.py
index 9cfe60d..27db2c8 100644
--- a/plugins/fHDHR_plugin_stream_ffmpeg/__init__.py
+++ b/plugins/fHDHR_plugin_stream_ffmpeg/__init__.py
@@ -23,7 +23,8 @@ def setup(plugin):
 
 class Plugin_OBJ():
 
-    def __init__(self, plugin_utils, stream_args, tuner):
+    def __init__(self, fhdhr, plugin_utils, stream_args, tuner):
+        self.fhdhr = fhdhr
         self.plugin_utils = plugin_utils
         self.stream_args = stream_args
         self.tuner = tuner
diff --git a/plugins/fHDHR_plugin_stream_vlc/__init__.py b/plugins/fHDHR_plugin_stream_vlc/__init__.py
index 3e5b8bd..23a9b3b 100644
--- a/plugins/fHDHR_plugin_stream_vlc/__init__.py
+++ b/plugins/fHDHR_plugin_stream_vlc/__init__.py
@@ -23,7 +23,8 @@ def setup(plugin):
 
 class Plugin_OBJ():
 
-    def __init__(self, plugin_utils, stream_args, tuner):
+    def __init__(self, fhdhr, plugin_utils, stream_args, tuner):
+        self.fhdhr = fhdhr
         self.plugin_utils = plugin_utils
         self.stream_args = stream_args
         self.tuner = tuner