diff --git a/macro/run/run_unpack_online.C b/macro/run/run_unpack_online.C
index 831e778aff8a7460a201c71b24e71246db684123..049c02a66daa2700dccb3b1a4f696c098ac747b9 100644
--- a/macro/run/run_unpack_online.C
+++ b/macro/run/run_unpack_online.C
@@ -210,13 +210,16 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
     trdfasp2dconfig->SetDoWriteOutput();
     // Activate the line below to write Trd1D digis to a separate "TrdFaspDigi" branch. Can be used to separate between Fasp and Spadic digis
     //trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi");
+    uint8_t map[NFASPMOD];
     if (runid <= 1588) {
-      uint8_t map[NFASPMOD], map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
-
+      uint8_t map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
       for (int i(0); i < NFASPMOD; i++)
         map[i] = (i < 12 ? map21[i] : i);
-      trdfasp2dconfig->SetFaspMapping(5, map);
     }
+    else
+      for (int i(0); i < NFASPMOD; i++)
+        map[i] = i;
+    trdfasp2dconfig->SetFaspMapping(5, map);
     std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data());
     trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d);
     trdfasp2dconfig->SetSystemTimeOffset(-1800);  // [ns] value to be updated