diff --git a/addons.xml b/addons.xml
index da4a642e..5c683e36 100644
--- a/addons.xml
+++ b/addons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
-<addon id="plugin.video.pseudotv.live" version="0.5.7" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.7a" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>
diff --git a/addons.xml.md5 b/addons.xml.md5
index b1e3a176..56879593 100644
--- a/addons.xml.md5
+++ b/addons.xml.md5
@@ -1 +1 @@
-7d74f54baabc603f206762035ab12e62
\ No newline at end of file
+56ec0c3f60fe16dd084b0788864f4517
\ No newline at end of file
diff --git a/plugin.video.pseudotv.live/addon.xml b/plugin.video.pseudotv.live/addon.xml
index dd6b6c0f..06b91bf6 100644
--- a/plugin.video.pseudotv.live/addon.xml
+++ b/plugin.video.pseudotv.live/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.pseudotv.live" version="0.5.7" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.7a" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>
diff --git a/plugin.video.pseudotv.live/resources/lib/builder.py b/plugin.video.pseudotv.live/resources/lib/builder.py
index caabb208..997445a0 100644
--- a/plugin.video.pseudotv.live/resources/lib/builder.py
+++ b/plugin.video.pseudotv.live/resources/lib/builder.py
@@ -205,18 +205,19 @@ def buildCells(self, citem: dict={}, duration: int=10800, type: str='video', ent
 
     def addScheduling(self, citem: dict, fileList: list, start: time, padScheduling=True) -> list:
         self.log("addScheduling, [%s] IN fileList = %s, start = %s, padScheduling = %s"%(citem['id'],len(fileList),start,padScheduling))
-        totDur  = 0
-        tmpList = []
-        nowtime = getUTCstamp()
-
-        for idx, item in enumerate(self.runActions(RULES_ACTION_CHANNEL_BUILD_TIME_PRE, citem, fileList, inherited=self)):
+        totDur   = 0
+        tmpList  = []
+        nowtime  = getUTCstamp()
+        fileList = self.runActions(RULES_ACTION_CHANNEL_BUILD_TIME_PRE, citem, fileList, inherited=self)
+        
+        for idx, item in enumerate(fileList):
             item["idx"]   = idx
             item['start'] = start
             item['stop']  = start + item['duration']
             start = item['stop']
             tmpList.append(item)
 
-        if padScheduling:
+        if padScheduling and len(tmpList) > 0:
             iters = cycle(fileList)
             while not self.service.monitor.abortRequested() and tmpList[-1].get('stop') <= (nowtime + MIN_EPG_DURATION):
                 if tmpList[-1].get('stop') >= (nowtime + MIN_EPG_DURATION): 
diff --git a/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.background.xml b/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.background.xml
index c9b38d5e..8a9b9f0c 100644
--- a/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.background.xml
+++ b/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.background.xml
@@ -80,7 +80,7 @@
             <control type="grouplist">
                 <posx>130</posx>
                 <posy>735</posy>
-                <itemgap>10</itemgap>
+                <itemgap>15</itemgap>
                 <orientation>vertical</orientation>
                 <control type="image" id="40004">
                     <description>OnNext Image</description>
diff --git a/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.onnext.xml b/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.onnext.xml
index 0be63179..262c7e03 100644
--- a/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.onnext.xml
+++ b/plugin.video.pseudotv.live/resources/skins/default/1080i/plugin.video.pseudotv.live.onnext.xml
@@ -22,7 +22,7 @@
             <control type="grouplist">
                 <posx>130</posx>
                 <posy>735</posy>
-                <itemgap>10</itemgap>
+                <itemgap>15</itemgap>
                 <orientation>vertical</orientation>
                 <Visible>Window.IsActive(fullscreenvideo) + [!Window.IsActive(videoosd)]</Visible>
                 <control type="image" id="40004">
diff --git a/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.5.7a.zip b/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.5.7a.zip
new file mode 100644
index 00000000..fa533f30
Binary files /dev/null and b/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.5.7a.zip differ