diff --git a/DataFormats/GEMDigi/interface/AMC13Event.h b/DataFormats/GEMDigi/interface/AMC13Event.h
index b1d0e8cf2657a..f659ff208f2fa 100644
--- a/DataFormats/GEMDigi/interface/AMC13Event.h
+++ b/DataFormats/GEMDigi/interface/AMC13Event.h
@@ -33,7 +33,8 @@ namespace gem {
       uint64_t bxIdT : 12;  // bx id
       uint64_t lv1IdT : 8;  // level 1 id
       uint64_t blkN : 8;    // block number
-      uint64_t crc32 : 36;  // Overall CRC (first 32 bits)
+      uint64_t : 4;
+      uint64_t crc32 : 32;  // Overall CRC
     };
   };
   union CDFTrailer {
diff --git a/DataFormats/GEMDigi/interface/GEMAMCStatus.h b/DataFormats/GEMDigi/interface/GEMAMCStatus.h
index f9fcb88311ccb..d66d59c55dadc 100644
--- a/DataFormats/GEMDigi/interface/GEMAMCStatus.h
+++ b/DataFormats/GEMDigi/interface/GEMAMCStatus.h
@@ -37,7 +37,6 @@ class GEMAMCStatus {
     error.badBC = (amc13->bunchCrossing() != amc.bunchCrossing());
     error.badRunType = amc.runType() != 0x1;
     error.badOC = (amc13->orbitNumber() != amc.orbitNumber());
-    error.badCRC = (amc13->crc() != amc.crc());
     error.MMCMlocked = !amc.mmcmLocked();
     error.DAQclocklocked = !amc.daqClockLocked();
     error.DAQnotReday = !amc.daqReady();
diff --git a/EventFilter/GEMRawToDigi/test/gemUnPackerTester.py b/EventFilter/GEMRawToDigi/test/gemUnPackerTester.py
index a5aa68f145067..ac7bfdfeab3e1 100755
--- a/EventFilter/GEMRawToDigi/test/gemUnPackerTester.py
+++ b/EventFilter/GEMRawToDigi/test/gemUnPackerTester.py
@@ -1,6 +1,8 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9
 
-process = cms.Process('gemTester')
+process = cms.Process('gemTester', Phase2C11I13M9)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.StandardSequences.DigiToRaw_cff')
@@ -13,9 +15,11 @@
 
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, '113X_mcRun4_realistic_v4', '')
-process.gemPacker.useDBEMap = True
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
+
+#process.gemPacker.useDBEMap = True
+#process.muonGEMDigis.readMultiBX = True
 
-process.muonGEMDigis.readMultiBX = True
 process.muonGEMDigis.useDBEMap = process.gemPacker.useDBEMap
 process.muonGEMDigis.keepDAQStatus = True