diff --git a/fHDHR/origin/origin_epg.py b/fHDHR/origin/origin_epg.py
index d4a39ab..ea51da3 100644
--- a/fHDHR/origin/origin_epg.py
+++ b/fHDHR/origin/origin_epg.py
@@ -67,9 +67,9 @@ class OriginEPG():
                                     (self.media_url, schedulename_quote, datestring))
                     epgguide.extend(self.get_cached(epgname, todaydate, schedule_url))
 
-                offset = '+0000'
+                offset = '+00:00'
                 if "pst" in c["origin_id"]:
-                    offset = '-0300'
+                    offset = '-03:00'
 
                 progindex = 0
                 for program_dict in epgguide:
@@ -154,12 +154,9 @@ class OriginEPG():
         return duration
 
     def xmltimestamp_toonami(self, inputtime, offset):
-        xmltime = inputtime.replace('Z', '+00:00')
+        xmltime = inputtime.replace('Z', offset)
         xmltime = datetime.datetime.fromisoformat(xmltime)
         xmltime = xmltime.strftime('%Y%m%d%H%M%S %z')
-        xmltime = str(xmltime).replace('+00:00', offset)
-        if not xmltime.endswith('+00:00'):
-            print(xmltime)
         return xmltime
 
     def get_prog_timedict(self, starttime, endtime, offset):