diff --git a/src/THcConfigEvtHandler.cxx b/src/THcConfigEvtHandler.cxx
index e4607cbabd1ba606505634db5b4662e357ad6e69..e19d1be5baaf818edc9cc646e0b1b5a2b6206def 100644
--- a/src/THcConfigEvtHandler.cxx
+++ b/src/THcConfigEvtHandler.cxx
@@ -354,6 +354,8 @@ THaAnalysisObject::EStatus THcConfigEvtHandler::Init(const TDatime& date)
     eventtypes.push_back(125);  // what events to look for
   }
 
+  CrateInfoMap.clear();
+
   fStatus = kOK;
   return kOK;
 }
diff --git a/src/THcHitList.cxx b/src/THcHitList.cxx
index a62908ceedad51df21d950a6d2c47ec8e811c59c..69f40791530158ba78b3e8e6a2bf4217ca11846c 100644
--- a/src/THcHitList.cxx
+++ b/src/THcHitList.cxx
@@ -118,10 +118,21 @@ void THcHitList::InitHitList(THaDetMap* detmap,
     }
   }
 
-  fPSE125 = static_cast<THcConfigEvtHandler*>(gHaEvtHandlers->FindObject("HC"));
-  if (!fPSE125) {
+  // Find the Event 125 handler
+  TObjLink *lnk = gHaEvtHandlers->FirstLink();
+  while (lnk) {
+    if(strcmp(lnk->GetObject()->ClassName(),"THcConfigEvtHandler")==0) {
+      break;
+    }
+    lnk = lnk->Next();
+  }
+  if(lnk) {
+    fPSE125 = static_cast<THcConfigEvtHandler*>(lnk->GetObject());
+  } else {
     cout << "THcHitList::InitHitList : Prestart event 125 not found." << endl;
+    fPSE125 = 0;
   }
+  fHaveFADCInfo = kFALSE;
 }
 
 /**
@@ -259,12 +270,15 @@ Int_t THcHitList::DecodeToHitList( const THaEvData& evdata, Bool_t suppresswarni
 	}
       } else {			// This is a Flash ADC
 
-        if (fPSE125) {  // Set F250 parameters.
-          rawhit->SetF250Params(
-            fPSE125->GetNSA(d->crate),
-            fPSE125->GetNSB(d->crate),
-            fPSE125->GetNPED(d->crate)
-          );
+        if (fPSE125) {
+	  if(!fHaveFADCInfo) {
+	    fNSA = fPSE125->GetNSA(d->crate);
+	    fNSB = fPSE125->GetNSB(d->crate);
+	    fNPED = fPSE125->GetNPED(d->crate);
+	    fHaveFADCInfo = kTRUE;
+	  }
+// Set F250 parameters.
+          rawhit->SetF250Params(fNSA, fNSB, fNPED);
         }
 
 	// Copy the samples
diff --git a/src/THcHitList.h b/src/THcHitList.h
index 7611e14101b2178294a695f11ded538308668a06..eb576f28a0f4798097e07250f48e7c6b44a7cdd1 100644
--- a/src/THcHitList.h
+++ b/src/THcHitList.h
@@ -60,6 +60,10 @@ protected:
   THcRawHit::ESignalType *fSignalTypes;
 
   THcConfigEvtHandler* fPSE125;
+  Bool_t fHaveFADCInfo;
+  Int_t fNSA;
+  Int_t fNSB;
+  Int_t fNPED;
 
   ClassDef(THcHitList,0);  // List of raw hits sorted by plane, counter
 };