diff --git a/fHDHR/device/tuners/__init__.py b/fHDHR/device/tuners/__init__.py
index b8c4d03..65610cb 100644
--- a/fHDHR/device/tuners/__init__.py
+++ b/fHDHR/device/tuners/__init__.py
@@ -17,17 +17,17 @@ class Tuners():
 
         self.fhdhr.logger.info("Creating %s tuners." % str(self.max_tuners))
 
-        for i in range(1, self.max_tuners + 1):
-            self.tuners[i] = Tuner(fhdhr, i, epg)
+        for i in range(0, self.max_tuners):
+            self.tuners[str(i)] = Tuner(fhdhr, i, epg)
 
     def tuner_grab(self, tuner_number):
 
-        if int(tuner_number) not in list(self.tuners.keys()):
+        if str(tuner_number) not in list(self.tuners.keys()):
             self.fhdhr.logger.error("Tuner %s does not exist." % str(tuner_number))
             raise TunerError("806 - Tune Failed")
 
         # TunerError will raise if unavailable
-        self.tuners[int(tuner_number)].grab()
+        self.tuners[str(tuner_number)].grab()
 
         return tuner_number
 
@@ -38,7 +38,7 @@ class Tuners():
 
         for tunernum in list(self.tuners.keys()):
             try:
-                self.tuners[int(tunernum)].grab()
+                self.tuners[str(tunernum)].grab()
             except TunerError:
                 continue
             else:
@@ -47,18 +47,18 @@ class Tuners():
         raise TunerError("805 - All Tuners In Use")
 
     def tuner_close(self, tunernum):
-        self.tuners[int(tunernum)].close()
+        self.tuners[str(tunernum)].close()
 
     def status(self):
         all_status = {}
         for tunernum in list(self.tuners.keys()):
-            all_status[tunernum] = self.tuners[int(tunernum)].get_status()
+            all_status[tunernum] = self.tuners[str(tunernum)].get_status()
         return all_status
 
     def available_tuner_count(self):
         available_tuners = 0
         for tunernum in list(self.tuners.keys()):
-            tuner_status = self.tuners[int(tunernum)].get_status()
+            tuner_status = self.tuners[str(tunernum)].get_status()
             if tuner_status["status"] == "Inactive":
                 available_tuners += 1
         return available_tuners
@@ -66,7 +66,7 @@ class Tuners():
     def inuse_tuner_count(self):
         inuse_tuners = 0
         for tunernum in list(self.tuners.keys()):
-            tuner_status = self.tuners[int(tunernum)].get_status()
+            tuner_status = self.tuners[str(tunernum)].get_status()
             if tuner_status["status"] == "Active":
                 inuse_tuners += 1
         return inuse_tuners
diff --git a/fHDHR/http/api/watch.py b/fHDHR/http/api/watch.py
index a26ef68..fdab038 100644
--- a/fHDHR/http/api/watch.py
+++ b/fHDHR/http/api/watch.py
@@ -80,7 +80,7 @@ class Watch():
                 response.headers["X-fHDHR-Error"] = str(e)
                 self.fhdhr.logger.error(response.headers["X-fHDHR-Error"])
                 abort(response)
-            tuner = self.fhdhr.device.tuners.tuners[int(tunernum)]
+            tuner = self.fhdhr.device.tuners.tuners[str(tunernum)]
 
             try:
                 stream_args = self.fhdhr.device.tuners.get_stream_info(stream_args)
@@ -103,10 +103,10 @@ class Watch():
 
         elif method == "close":
 
-            if not tuner_number or int(tuner_number) not in list(self.fhdhr.device.tuners.tuners.keys()):
+            if not tuner_number or str(tuner_number) not in list(self.fhdhr.device.tuners.tuners.keys()):
                 return "%s Invalid tuner" % str(tuner_number)
 
-            tuner = self.fhdhr.device.tuners.tuners[int(tuner_number)]
+            tuner = self.fhdhr.device.tuners.tuners[str(tuner_number)]
             tuner.close()
 
         else: