diff --git a/R/Collect.R b/R/Collect.R
index 6d752f5fc907d6f6fbe84d3aa015ccbf8f4afc07..62e105eef8dae986b7b6752d0ceafe91283ff2cf 100644
--- a/R/Collect.R
+++ b/R/Collect.R
@@ -386,19 +386,18 @@ Collect_autosubmit <- function(startr_exec, wait = TRUE, remove = TRUE) {
   run_dir <- startr_exec$cluster[['run_dir']]
 
   done <- FALSE
-  sum_received_chunks <- sum(grepl('.*\\.Rds$', list.files(remote_autosubmit_suite_dir_suite)))
 
   while (!done) { # If wait, try until it is done
+    sum_received_chunks <- sum(grepl('.*\\.Rds$', list.files(remote_autosubmit_suite_dir_suite)))
     if (sum_received_chunks / num_outputs == prod(unlist(chunks))) {
       done <- TRUE
 
     } else if (!wait) {
       stop("Computation in progress...")
     } else {
-      Sys.sleep(startr_exec$cluster[['polling_period']])
       message("Computation in progress,  ", sum_received_chunks, "  of ", prod(unlist(chunks)), " chunks are done...\n",
               "Check status on Autosubmit GUI: https://earth.bsc.es/autosubmitapp/experiment/", suite_id)
-#      Sys.sleep(min(sqrt(attempt), 5))
+      Sys.sleep(startr_exec$cluster[['polling_period']])
     }
 
   } # while !done