diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
index a88cdaed26a14..5077c8e0bfbb4 100644
--- a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
+++ b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
@@ -15,6 +15,7 @@
 #include "DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/HGCalCommonData/interface/HGCalCassette.h"
 #include "Geometry/HGCalCommonData/interface/HGCalCell.h"
 #include "Geometry/HGCalCommonData/interface/HGCalCellOffset.h"
@@ -42,6 +43,7 @@ class HGCalDDDConstants {
   std::array<int, 5> assignCellHex(float x, float y, int zside, int lay, bool reco, bool extend, bool debug) const;
   std::array<int, 3> assignCellTrap(float x, float y, float z, int lay, bool reco) const;
   std::vector<int> calibCells(bool hd, bool full) const {
+    edm::LogVerbatim("HGCal") << "hd " << hd << " full " << full;
     if (hd) {
       return (full ? hgpar_->calibCellFullHD_ : hgpar_->calibCellPartHD_);
     } else {
diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
index 37ef5639ecba4..ad106aac2e943 100644
--- a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
+++ b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -1784,7 +1784,7 @@ void HGCalDDDConstants::waferFromPosition(const double x,
                                           << " Type " << (ktr->second).type << ":" << (ktr->second).part << ":"
                                           << (ktr->second).orient << ":" << (ktr->second).cassette;
         } else {
-          if (mode_ == HGCalGeometryMode::Hexagon8FineCell) {
+          if (mode_ >= HGCalGeometryMode::Hexagon8Cassette) {
             if (debug)
               edm::LogVerbatim("HGCalGeom") << "Cannot find waferinformation --> Skip this " << layer << ":" << waferU
                                             << ":" << waferV << " wafer assignment";
diff --git a/Geometry/HGCalCommonData/src/HGCalTypes.cc b/Geometry/HGCalCommonData/src/HGCalTypes.cc
index d19036f9b7a69..8529116c839f6 100644
--- a/Geometry/HGCalCommonData/src/HGCalTypes.cc
+++ b/Geometry/HGCalCommonData/src/HGCalTypes.cc
@@ -42,9 +42,9 @@ int32_t HGCalTypes::getUnpackedCell6(int id) { return (id % faccell6_); }
 int32_t HGCalTypes::layerType(int type) {
   static const int32_t layerTypeX[7] = {HGCalTypes::WaferCenter,
                                         HGCalTypes::WaferCenterB,
-                                        HGCalTypes::WaferCenterR,
                                         HGCalTypes::CornerCenterYp,
                                         HGCalTypes::CornerCenterYm,
+                                        HGCalTypes::WaferCenterR,
                                         HGCalTypes::CornerCenterXp,
                                         HGCalTypes::CornerCenterXm};
   return ((type >= 0) && (type < 7)) ? layerTypeX[type] : HGCalTypes::WaferCenter;