1 files changed, 4 insertions, 4 deletions

diff --git a/libtransport/includes/hicn/transport/core/packet.h b/libtransport/includes/hicn/transport/core/packet.h
index e58e7962d..2efd7439d 100644
--- a/libtransport/includes/hicn/transport/core/packet.h
+++ b/libtransport/includes/hicn/transport/core/packet.h
@@ -148,15 +148,15 @@ class Packet : public std::enable_shared_from_this<Packet> {
 
   std::pair<const uint8_t *, std::size_t> getPayloadReference() const {
     int signature_size = 0;
+
     if (_is_ah(format_)) {
       signature_size = (uint32_t)getSignatureSize();
     }
 
     auto header_size = getHeaderSizeFromFormat(format_, signature_size);
-    auto payload_length = packet_->length() - header_size;
+    auto payload_length = payloadSize();
 
-    return std::make_pair(packet_->data() + header_size,
-                          payload_length);
+    return std::make_pair(packet_->data() + header_size, payload_length);
   }
 
   Packet &updateLength(std::size_t length = 0);
@@ -229,6 +229,7 @@ class Packet : public std::enable_shared_from_this<Packet> {
   Packet &setTTL(uint8_t hops);
   uint8_t getTTL() const;
 
+  void separateHeaderPayload();
   void resetPayload();
 
  private:
@@ -248,7 +249,6 @@ class Packet : public std::enable_shared_from_this<Packet> {
   }
 
   uint8_t *getSignature() const;
-  void separateHeaderPayload();
 
  protected:
   Name name_;