diff --git a/CMakeLists.txt b/CMakeLists.txt
index adecffc0f4dbf..f0e1ce3007f75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,9 @@ cmake_minimum_required(VERSION 3.27.1 FATAL_ERROR)
 # C++ as we _do_ have some C files to compile explicitely as C (e.g. gl3w.c)
 project(O2 LANGUAGES C CXX VERSION 1.2.0)
 
+add_compile_options(-fsanitize=address -fno-omit-frame-pointer)
+add_link_options(-fsanitize=address)
+
 include(CTest)
 
 # Project wide setup
diff --git a/Detectors/GlobalTracking/src/MatchTPCITS.cxx b/Detectors/GlobalTracking/src/MatchTPCITS.cxx
index 1457790c7c531..20f05c4426195 100644
--- a/Detectors/GlobalTracking/src/MatchTPCITS.cxx
+++ b/Detectors/GlobalTracking/src/MatchTPCITS.cxx
@@ -880,7 +880,6 @@ void MatchTPCITS::doMatching(int sec)
   int idxMinTPC = timeStartTPC[minROFITS];                             // index of 1st cached TPC track within cached ITS ROFrames
   auto t2nbs = tpcTimeBin2MUS(mZ2TPCBin * mParams->tpcTimeICMatchingNSigma);
   bool checkInteractionCandidates = mUseFT0 && mParams->validateMatchByFIT != MatchTPCITSParams::Disable;
-
   int itsROBin = 0;
   for (int itpc = idxMinTPC; itpc < nTracksTPC; itpc++) {
     auto& trefTPC = mTPCWork[cacheTPC[itpc]];
@@ -893,6 +892,11 @@ void MatchTPCITS::doMatching(int sec)
       break;
     }
     int iits0 = timeStartITS[itsROBin];
+    if (iits0 < 0) {
+      LOGP(alarm, "doMatching sec={} itpc={} itsROBin={} timeStartITS.size={} iits0={} tmn={} triggered={}",
+           sec, itpc, itsROBin, timeStartITS.size(), iits0, tmn, mITSTriggered);
+      continue; // no ITS tracks start at this ROF bin
+    }
     nCheckTPCControl++;
     for (auto iits = iits0; iits < nTracksITS; iits++) {
       auto& trefITS = mITSWork[cacheITS[iits]];
diff --git a/Detectors/GlobalTrackingWorkflow/CMakeLists.txt b/Detectors/GlobalTrackingWorkflow/CMakeLists.txt
index 6f29ab1930f95..0d8dc646689cb 100644
--- a/Detectors/GlobalTrackingWorkflow/CMakeLists.txt
+++ b/Detectors/GlobalTrackingWorkflow/CMakeLists.txt
@@ -11,8 +11,6 @@
 
 # FIXME: do we actually need a library here, or is the executable enough ?
 
-#add_compile_options(-O0 -g -fPIC -fno-omit-frame-pointer)
-
 o2_add_library(GlobalTrackingWorkflow
                SOURCES src/TrackWriterTPCITSSpec.cxx
                        src/TPCITSMatchingSpec.cxx