diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b1ad8f69a6822501a710ae64bbae286ae102f7f..6e8eec904da58c1f0ef2c4d87eefb79651580358 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,12 +134,11 @@ CheckRadLen:
     - apt update -y && apt install -y git bash
     - ci_scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
     - git fetch upstream
-    - git diff HEAD^ --name-only 
-    - git diff HEAD^ --name-only 2>/dev/null | sed -ne '/\.geo\.root/p' | tee > LIST_GEO_FILES 
+    - git diff upstream/master --name-only
+    - touch LIST_GEO_FILES
     - FAIL=0
-    - cat LIST_GEO_FILES
-    - for geo in `cat LIST_GEO_FILES`; do echo $geo; sh ci_scripts/check_radlen.sh $geo; if [ $? -ne 0 ]; then let FAIL++; fi; done
-    - exit $FAIL;
+    - for file in `git diff upstream/master 2>/dev/null --name-only | sed -ne '/\.geo\.root$/p'`; do if [ -f $file ]; then echo $file; sh ci_scripts/check_radlen.sh $file; if [ $? -ne 0 ]; then let FAIL++; fi; fi; done
+    - exit $FAIL
 
 InformCodeOwners:
   stage: finalise
diff --git a/ci_scripts/check_radlen.sh b/ci_scripts/check_radlen.sh
index b5c08d37609f8b913f6e8453e7b63a37eec610c7..cbb1989cda5729a9bd75359a36a4584fc83f95a1 100755
--- a/ci_scripts/check_radlen.sh
+++ b/ci_scripts/check_radlen.sh
@@ -33,16 +33,16 @@ variables=`echo "$line" | sed -e 's/eff//g' | sed -e 's/index/jndex/g' | sed -e
     $variables \
     'BEGIN{\
         if(Z<1){
-        printf "SKIP \t "; \
+        printf "SKIP    "; \
         exit 3;
         };
         cal_rad_len=(716.4*A/(Z*(Z+1)*log(287/sqrt(Z)))/rho);\
         #print cal_rad_len;
         diff=(cal_rad_len - radlen);\
         if(diff*diff <= TOL*TOL*radlen*radlen ){\
-        printf "OKAY  " cal_rad_len; exit 1;
+        printf "OKAY    " cal_rad_len; exit 1;
         }else{\
-        printf "FAIL  " cal_rad_len; exit 2;
+        printf "FAIL    " cal_rad_len; exit 2;
         }}'
 
     STATUS=$?;