diff --git a/src/THcDriftChamberPlane.cxx b/src/THcDriftChamberPlane.cxx
index 1040342149b78125e1d86512623579ff25ca21c8..0ded85072bf8bbaa4d2cc1508da8ffd26e5303d4 100644
--- a/src/THcDriftChamberPlane.cxx
+++ b/src/THcDriftChamberPlane.cxx
@@ -13,6 +13,7 @@
 #include "THcParmList.h"
 #include "THcHitList.h"
 #include "THcDriftChamber.h"
+#include "TClass.h"
 
 #include <cstring>
 #include <cstdio>
@@ -32,6 +33,9 @@ THcDriftChamberPlane::THcDriftChamberPlane( const char* name,
 {
   // Normal constructor with name and description
   fTDCHits = new TClonesArray("THcSignalHit",100);
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,32,0)
+  fTDCHitsClass = fTDCHits->GetClass();
+#endif
   fPlaneNum = planenum;
 }
 
diff --git a/src/THcDriftChamberPlane.h b/src/THcDriftChamberPlane.h
index 29f4bb799abbc484d2f4f88d2caf9bef43dd5d00..bbe6e7f4a1d54e8bc36bc633ca981073506125f4 100644
--- a/src/THcDriftChamberPlane.h
+++ b/src/THcDriftChamberPlane.h
@@ -44,6 +44,8 @@ class THcDriftChamberPlane : public THaSubDetector {
 
   TClonesArray* fTDCHits;
 
+  TClass* fTDCHitsClass;
+
   Int_t fPlaneNum;
 
   virtual Int_t  ReadDatabase( const TDatime& date );
diff --git a/src/THcShowerPlane.cxx b/src/THcShowerPlane.cxx
index 1da463273dfe58305fd2b8691a450be7ef07eab0..0fc4e4e3d1a9f74923444db81ff66a294d9009f5 100644
--- a/src/THcShowerPlane.cxx
+++ b/src/THcShowerPlane.cxx
@@ -185,7 +185,7 @@ if(hit->fADC_pos >  0) {
 	THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
 	sighit->Set(hit->fCounter, hit->fADC_pos);
 #else
-	TObject* obj = (*fPosTDCHits)[nPosADCHits++];
+	TObject* obj = (*fPosADCHits)[nPosADCHits++];
 	R__ASSERT( obj );
 if(!obj->TestBit (TObject::kNotDeleted))
 	fPosADCHitsClass->New(obj);
@@ -199,7 +199,7 @@ if(hit->fADC_neg >  0) {
 	THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
 	sighit->Set(hit->fCounter, hit->fADC_neg);
 #else
-	TObject* obj = (*fPosTDCHits)[nNegADCHits++];
+	TObject* obj = (*fPosADCHits)[nNegADCHits++];
 	R__ASSERT( obj );
 if(!obj->TestBit (TObject::kNotDeleted))
 	fNegADCHitsClass->New(obj);