diff --git a/scripts/checklibs.sh b/scripts/checklibs.sh
index 9c95ff650f8aba53ad1c416f58e7273a9a0ddd35..3212e736ef10580ed7ce789884e9d6891f27e5ca 100755
--- a/scripts/checklibs.sh
+++ b/scripts/checklibs.sh
@@ -29,12 +29,15 @@ for lib in $all_libs; do
     # So \\\\ becomes \\ which becomes \
     # => Seems to still work with mawk (Mike's awk, debian 10) on run2, so ok like this?
     rootmap_defs_token="\\\\[ lib"
-    # if [[ ${rootmap_file} == *"libHal"* ]]; then
-    #  # Commented out for now as lead to missing headers detection in 60% of HAL libraries (9/14)
-    #  rootmap_defs_token="\\\\[ Hal"
-    # fi
     first_class=$(awk -v token="${rootmap_defs_token}" '$0 ~ token ,0' ${rootmap_file} | grep -m1 "${start_token_class}" | tr -d ';')
+   if [[ "" == ${first_class} && ${rootmap_file} == *"libHal"* ]]; then
+      rootmap_defs_token="\\\\[ Hal"
+      first_class=$(awk -v token="${rootmap_defs_token}" '$0 ~ token ,0' ${rootmap_file} | grep -m1 "${start_token_class}" | tr -d ';')
+    fi
     first_class="${first_class##"${start_token_class}"}"
+  if [[ "" == ${first_class} ]]; then
+    echo "WARNING: No 1st class found in rootmap for ${lib} (prob. need tuning of checklibs.sh)"
+  fi
 
   # Printouts commented out to limit spam in test logs
   # FIXME: make it a "-v" option
@@ -43,7 +46,6 @@ for lib in $all_libs; do
   #  echo "Loading the library ${lib}"
   fi
 
-
   root -l -q -b "${SCRIPTDIR}/loadlib.C(\"${lib}\", \"${first_class}\")" &> ${tmpfile}
   retval=$?
   if [[ retval -ne 0 ]]; then