diff --git a/fHDHR/device/channels/channel.py b/fHDHR/device/channels/channel.py
index ee79e88..5cc8a46 100644
--- a/fHDHR/device/channels/channel.py
+++ b/fHDHR/device/channels/channel.py
@@ -84,6 +84,8 @@ class Channel():
 
     def set_status(self, updatedict):
         for key in list(updatedict.keys()):
+            if key == "number":
+                updatedict[key] = str(float(updatedict[key]))
             self.dict[key] = updatedict[key]
         self.fhdhr.db.set_channel_value(self.dict["id"], "dict", self.dict)
 
diff --git a/fHDHR/http/api/m3u.py b/fHDHR/http/api/m3u.py
index 1bafffc..940e7c7 100644
--- a/fHDHR/http/api/m3u.py
+++ b/fHDHR/http/api/m3u.py
@@ -46,7 +46,7 @@ class M3U():
                     channel_obj = self.fhdhr.device.channels.list[fhdhr_id]
                     if channel_obj.enabled:
                         channel_items.append(channel_obj)
-            elif channel in self.fhdhr.device.channels.get_channel_list("number"):
+            elif str(channel) in [str(x) for x in self.fhdhr.device.channels.get_channel_list("number")]:
                 channel_obj = self.fhdhr.device.channels.get_channel_obj("number", channel)
                 fileName = str(channel_obj.number) + ".m3u"
                 if channel_obj.enabled:
diff --git a/fHDHR/http/api/watch.py b/fHDHR/http/api/watch.py
index 7424cb9..56825c3 100644
--- a/fHDHR/http/api/watch.py
+++ b/fHDHR/http/api/watch.py
@@ -34,7 +34,7 @@ class Watch():
             if not channel_number:
                 return "Missing Channel"
 
-            if channel_number not in self.fhdhr.device.channels.get_channel_list("number"):
+            if str(channel_number) not in [str(x) for x in self.fhdhr.device.channels.get_channel_list("number")]:
                 response = Response("Not Found", status=404)
                 response.headers["X-fHDHR-Error"] = "801 - Unknown Channel"
                 self.fhdhr.logger.error(response.headers["X-fHDHR-Error"])