diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index 6ce4156c729caecc62d6f35c78e2c3d60d70e82a..66bbc4141583ee2692048579136d821cc69257fd 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -410,10 +410,10 @@ ByteStreamEventStorageInputSvc::generateDataHeader()
     std::unique_ptr<DataHeader> dataHeader = std::make_unique<DataHeader>();
     // Declare header primary
     dataHeader->setStatus(DataHeader::Input);
-    //add the data header element self reference to the object vector
-    dataHeader->insert(*std::move(dataHeaderElement));
     // Set processTag
     dataHeader->setProcessTag(dataHeaderElement->getKey());
+    //add the data header element self reference to the object vector
+    dataHeader->insert(*std::move(dataHeaderElement));
 
     // Clean up EventInfo from the previous event
     key = m_eventInfoKey.value();
diff --git a/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx b/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx
index ee3a38d95fe8e71e989bb3b7c5bfb856663bd35b..b2aaf6ba49442c3468791894405318cd05b74641 100644
--- a/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx
+++ b/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx
@@ -89,7 +89,6 @@ namespace Athena_test {
   /**
    * An empty input store should not offend the tool and do nothing
    */
-  // cppcheck-suppress syntaxError
   TEST_F(ByteStreamMetadataToolTest, emptyInput) {
     EXPECT_TRUE(m_tool->beginInputFile().isSuccess());
     EXPECT_TRUE(