diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index 9e39090b..ed2e47d2 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -3109,10 +3109,10 @@ class DATA:
             if decoded_data[0] in [b'm']:
                 checksum_delivered = str(decoded_data[2], "utf-8").lower()
                 # transmission_uuid = decoded_data[3]
-                message = decoded_data[4]
-                filename = decoded_data[5]
-                # filetype = decoded_data[6]
-                # timestamp = decoded_data[7]
+                message = decoded_data[5]
+                filename = decoded_data[6]
+                # filetype = decoded_data[7]
+                # timestamp = decoded_data[4]
                 data = decoded_data[8]
             else:
                 message = b''