diff --git a/QN8066.py b/QN8066.py
index 910ce7b..480b928 100644
--- a/QN8066.py
+++ b/QN8066.py
@@ -183,10 +183,11 @@ def __init__(self, outer, data, delay=7):
 
     def updateData(self, data):
       super().updateData(data)
-      # Add 0x0d to end of last fragment to indicate RT is done
-      # TODO: This isn't quite correct - Should put 0x0d where a break is indicated in the rdsStyleText
-      if len(self.fragments[-1]) < self.frag_size:
-        self.fragments[-1] += chr(0x0d)
+      # Remove all trailing spaces and append chr(0x0d) if length < 64 (max RT fragment size)
+      for i in range(len(self.fragments)):
+        self.fragments[i] = self.fragments[i].rstrip()
+        if len(self.fragments[i]) < 64:
+          self.fragments[i] += chr(0x0d)
       self.ab = not self.ab
       logging.info('RT %s', self.fragments)