diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
index 23965b7bff6eab7fa9af388ed9152efeb8329863..604906579b14adfbc6bf3aab79d1b934e424eb06 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
@@ -30,7 +30,7 @@ def OutputStreamCfg(configFlags, streamName, ItemList=[] ):
    outputStream = AthenaOutputStream(
       outputAlgName,
       WritingTool = writingTool,
-      ItemList    = [ "xAOD::EventInfo#*", "xAOD::EventAuxInfo#*"  ]+ItemList, 
+      ItemList    = [ "xAOD::EventInfo#EventInfo", "xAOD::EventAuxInfo#EventInfoAux."  ]+ItemList, 
       OutputFile = fileName,
       HelperTools = [ streamInfoTool ],
       )
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.cxx
index d2f85fdaa3741f5cb32bdae903de1403bcec0527..33eb966c9f3efe01fe1fa6e5ab3dfb1ad0055799 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.cxx
@@ -32,6 +32,7 @@ MakeEventStreamInfo::MakeEventStreamInfo(const std::string& type,
 
    // Declare the properties
    declareProperty("Key", m_key = "");
+   declareProperty("EventInfoKey", m_eventInfoKey = "EventInfo");
 }
 //___________________________________________________________________________
 MakeEventStreamInfo::~MakeEventStreamInfo() {
@@ -99,7 +100,7 @@ StatusCode MakeEventStreamInfo::postExecute() {
       lumiN = pEvent->event_ID()->lumi_block();
       evtype = *pEvent->event_type();
    } else {
-      const xAOD::EventInfo* xEvent = m_eventStore->tryConstRetrieve<xAOD::EventInfo>();
+      const xAOD::EventInfo* xEvent = m_eventStore->tryConstRetrieve<xAOD::EventInfo>(m_eventInfoKey);
       if( xEvent ) {
          runN = xEvent->runNumber();
          lumiN = xEvent->lumiBlock();
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.h b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.h
index cc75b0c139798f8f614c551b0437d8619d0f2410..b98e148117ca903eb007ef8aa63f37f69d6f0a5a 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.h
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeEventStreamInfo.h
@@ -47,6 +47,9 @@ private:
    /// Key, the StoreGate key for the EventStreamInfo object.
    StringProperty m_key;
 
+   /// Key, the StoreGate key for the xAOD::EventInfo object.
+   StringProperty m_eventInfoKey;
+
    /// Pointer to the data stores
    ServiceHandle<StoreGateSvc> m_metaDataStore;
    ServiceHandle<StoreGateSvc> m_eventStore;