diff --git a/inc/etl/String.hpp b/inc/etl/String.hpp
index c771556a1b0a5d1041e42263de92a0ab198b2dfd..04112ef92d7ab6e6371e8b7e939619a4399c1f2e 100644
--- a/inc/etl/String.hpp
+++ b/inc/etl/String.hpp
@@ -60,7 +60,7 @@ public:
 	using etl::istring::append; // Use the append function from the parent
 
     /**
-     * Append a specified with of bytes from a uint8_t array to the String
+     * Append a specified number of bytes from a uint8_t array to the String
      * @details The array does NOT need to be null-terminated
      * @param data The characters to append
      * @param n The number of characters that \ref data contains
diff --git a/src/MessageParser.cpp b/src/MessageParser.cpp
index c15dafe4fc7d4a9fa273a9a9c21e991ef4cb85c9..de6ba7571e603703117c355c978b1890ad29cc04 100644
--- a/src/MessageParser.cpp
+++ b/src/MessageParser.cpp
@@ -108,7 +108,9 @@ Message MessageParser::parseECSSTC(uint8_t* data) {
 
 String<CCSDS_MAX_MESSAGE_SIZE> MessageParser::composeECSS(const Message& message, uint16_t size) {
 	uint8_t header[5];
-
+	header[0] = ECSS_PUS_VERSION << 4u; // Assign the pusVersion = 2
+	header[1] = message.serviceType;
+	header[2] = message.messageType;
 	if (message.packetType == Message::TC) {
 		header[0] = ECSS_PUS_VERSION << 4U; // Assign the pusVersion = 2
 		header[1] = message.serviceType;
@@ -116,9 +118,6 @@ String<CCSDS_MAX_MESSAGE_SIZE> MessageParser::composeECSS(const Message& message
 		header[3] = 0;
 		header[4] = 0;
 	} else {
-		header[0] = ECSS_PUS_VERSION << 4U; // Assign the pusVersion = 2
-		header[1] = message.serviceType;
-		header[2] = message.messageType;
 		header[3] = static_cast<uint8_t>(message.messageTypeCounter >> 8U);
 		header[4] = static_cast<uint8_t>(message.messageTypeCounter & 0xffU);
 	}