diff --git a/Aux/EventBuilder.cpp b/Aux/EventBuilder.cpp
index b3853b6..f6d5662 100644
--- a/Aux/EventBuilder.cpp
+++ b/Aux/EventBuilder.cpp
@@ -84,7 +84,7 @@ int main(int argc, char **argv) {
   totalHitCount += readerA->GetHitCount();
 
   for( int i = 1; i < nFile; i++){
-    FSUReader * readerB = new FSUReader(inFileName[i].Data(), 1, 0);
+    FSUReader * readerB = new FSUReader(inFileName[i].Data(), 1, 1);
     readerB->ScanNumBlock(0,0);
     totalHitCount += readerB->GetHitCount();
     fileInfo = {inFileName[i].Data(), readerB->GetSN() * 1000 +  readerB->GetFileOrder(), readerB->GetHitCount()};
diff --git a/ClassData.h b/ClassData.h
index 92cbed4..676cd19 100644
--- a/ClassData.h
+++ b/ClassData.h
@@ -330,6 +330,8 @@ inline void Data::ClearData(){
   tempDigiWaveform3.clear();
   tempDigiWaveform4.clear();
 
+  outFileIndex = 0;
+
   ClearNumEventsDecoded();
   ClearTriggerRate();