diff --git a/downloads-generation/models_class1_pan_unselected/GENERATE.WITH_HPC_CLUSTER.sh b/downloads-generation/models_class1_pan_unselected/GENERATE.WITH_HPC_CLUSTER.sh
index 5f0dc9848f8ab5f4dc3460c1cb32a2dc966f4c9b..ec154e9a3b0ebb84411d84b316ac6b307899fc0a 100755
--- a/downloads-generation/models_class1_pan_unselected/GENERATE.WITH_HPC_CLUSTER.sh
+++ b/downloads-generation/models_class1_pan_unselected/GENERATE.WITH_HPC_CLUSTER.sh
@@ -64,12 +64,10 @@ do
 
     # In case the above command fails, the job can may still be fixable manually.
     # So we wait for the COMPLETE file here.
-    if [ ! -f models.${kind}/COMPLETE ]
-    then
-        echo "Waiting for models.${kind}/COMPLETE"
-    fi
     while [ ! -f models.${kind}/COMPLETE ]
     do
+        echo "Waiting for $(pwd)/models.${kind}/COMPLETE"
+        echo "Processing script: $(pwd)/PROCESS.${kind}.sh"
         sleep 60
     done
 done