diff --git a/src/eotd.c b/src/eotd.c
index 94e0340..ae228d2 100644
--- a/src/eotd.c
+++ b/src/eotd.c
@@ -255,12 +255,12 @@ void decode_basic_r2f(uint64_t pkt, char *text, int text_size) {
 
 	strlcat(text, "block=BASIC", text_size);
 	add_comma(text, text_size);
+	get_r2f_unit_addr_code(pkt, text, text_size);
+	add_comma(text, text_size);
 	get_r2f_dev_batt_stat(pkt, text, text_size);
 	add_comma(text, text_size);
 	get_r2f_msg_id_type(pkt, text, text_size);
 	add_comma(text, text_size);
-	get_r2f_unit_addr_code(pkt, text, text_size);
-	add_comma(text, text_size);
 	get_r2f_brake_pressure(pkt, text, text_size);
 	add_comma(text, text_size);
 	get_r2f_disc_bits(pkt, text, text_size);
@@ -335,10 +335,10 @@ void decode_basic_f2r(uint64_t pkt, char *text, int text_size) {
 
 	strlcat(text, "block=BASIC", text_size);
 	add_comma(text, text_size);
-	get_f2r_msg_id_type(pkt, text, text_size);
-	add_comma(text, text_size);
 	get_f2r_unit_addr_code(pkt, text, text_size);
 	add_comma(text, text_size);
+	get_f2r_msg_id_type(pkt, text, text_size);
+	add_comma(text, text_size);
 	get_f2r_command(pkt, text, text_size);
 }