diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
index 12cc966ba42421d540bf970982a0bfa116f6b537..905f11421bc055f6956022aad4841098f77ae17d 100644
--- a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
+++ b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
@@ -310,7 +310,7 @@
     "            if const == \"SlopesCS\":\n",
     "                dbconst.data = slope_dict_to_arr(sanitised_const[mod])\n",
     "            else:\n",
-    "                dbconst.data = BPmap[mod].swapaxes(1,2) \n",
+    "                dbconst.data = BPmap[mod].swapaxes(0,2) \n",
     "\n",
     "            md = send_to_db(pdu, karabo_id, dbconst, condition,\n",
     "                            file_loc, report, cal_db_interface,\n",
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index 697d38830acec94a426c4b2e62e09b4f3928abc7..69659257f39e5111d8eb1555f9d3547f2015ac84 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -1410,11 +1410,13 @@ class AgipdCorrections:
 
         # add additional bad pixel information
         if any(self.relgain_bools):
-            for rg in ["CS", "PC"]:
-                if f"BadPixels{rg}" in cons_data:
-                    bp_relgain = np.moveaxis(
-                        cons_data[f"BadPixels{rg}"].astype(np.uint32), 0, 2)
-                    bpixels |= bp_relgain[..., :bpixels.shape[2], None]
+            if "BadPixelsCS" in cons_data:
+                bpixels |= cons_data["BadPixelsCS"].astype(
+                    np.uint32)[..., :bpixels.shape[2], None]
+            if "BadPixelsPC" in cons_data:
+                bpixels |= np.moveaxis(
+                    cons_data["BadPixelsPC"].astype(np.uint32),
+                    0, 2)[..., :bpixels.shape[2], None]
 
             # calculate relative gain from the constants
             rel_gain = np.ones((128, 512, self.max_cells, 3), np.float32)