diff --git a/src/ndn-traffic-client.cpp b/src/ndn-traffic-client.cpp
index 21b1750..781966a 100644
--- a/src/ndn-traffic-client.cpp
+++ b/src/ndn-traffic-client.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2019, Arizona Board of Regents.
+ * Copyright (c) 2014-2022, Arizona Board of Regents.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -392,8 +392,7 @@
     m_trafficPatterns[patternId].m_nInterestsReceived++;
 
     if (m_trafficPatterns[patternId].m_expectedContent) {
-      std::string receivedContent(reinterpret_cast<const char*>(data.getContent().value()),
-                                  data.getContent().value_size());
+      std::string receivedContent = readString(data.getContent());
       if (receivedContent != *m_trafficPatterns[patternId].m_expectedContent) {
         m_nContentInconsistencies++;
         m_trafficPatterns[patternId].m_nContentInconsistencies++;
diff --git a/src/ndn-traffic-server.cpp b/src/ndn-traffic-server.cpp
index 25ace67..b85556c 100644
--- a/src/ndn-traffic-server.cpp
+++ b/src/ndn-traffic-server.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2019, Arizona Board of Regents.
+ * Copyright (c) 2014-2022, Arizona Board of Regents.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -271,7 +271,7 @@
         content = getRandomByteString(*pattern.m_contentLength);
       if (!pattern.m_content.empty())
         content = pattern.m_content;
-      data.setContent(reinterpret_cast<const uint8_t*>(content.data()), content.length());
+      data.setContent(makeStringBlock(tlv::Content, content));
 
       m_keyChain.sign(data, pattern.m_signingInfo);