diff --git a/uwg/uwg.py b/uwg/uwg.py
index c36d2fca..b6d50b2a 100644
--- a/uwg/uwg.py
+++ b/uwg/uwg.py
@@ -1414,7 +1414,7 @@ def write_epw(self):
 
         for i in range(len(self.epwinput)):
             printme = ''
-            for ei in range(34):
+            for ei in range(len(self.epwinput[i])):
                 printme += "{}".format(self.epwinput[i][ei]) + ','
             printme = printme + "{}".format(self.epwinput[i][ei])
             new_epw_line = '{0}\n'.format(printme)