diff --git a/tmtcpacket/pus/TcPacketBase.cpp b/tmtcpacket/pus/TcPacketBase.cpp
index f8dba79f..0972ffff 100644
--- a/tmtcpacket/pus/TcPacketBase.cpp
+++ b/tmtcpacket/pus/TcPacketBase.cpp
@@ -52,10 +52,10 @@ void TcPacketBase::setData(const uint8_t* pData) {
 }
 
 void TcPacketBase::setApplicationData(const uint8_t * pData, uint16_t dataLen) {
-	SpacePacketBase::setData(pData);
-	tcData = (TcPacketPointer*) pData;
+	setData(pData);
+	// packet data length is actual size of data field minus 1
 	SpacePacketBase::setPacketDataLength(dataLen +
-			sizeof(PUSTcDataFieldHeader) + TcPacketBase::CRC_SIZE-1);
+			sizeof(PUSTcDataFieldHeader) + TcPacketBase::CRC_SIZE - 1);
 }
 
 uint8_t TcPacketBase::getSecondaryHeaderFlag() {