diff --git a/sysadmin/grid5000/cassandra/02-add_best_effort_node.sh b/sysadmin/grid5000/cassandra/02-add_best_effort_node.sh
index bfe9c30..31ba424 100755
--- a/sysadmin/grid5000/cassandra/02-add_best_effort_node.sh
+++ b/sysadmin/grid5000/cassandra/02-add_best_effort_node.sh
@@ -1,17 +1,21 @@
 #!/usr/bin/env bash
 
 set -eu
 
 SCRIPT_DIR="$(pwd $(dirname @0))"
 
 source "${SCRIPT_DIR}/environment.cfg"
 
 EXCLUDED_HOSTS=""
 
-TO_EXCLUDE="$(echo ${BEST_EFFORT_EXCLUDED_NODES} | sed 's/,/ /g')"
-
+if [ -n "${EXCLUDED_HOSTS}" ]; then
+  TO_EXCLUDE=" and host not in ($(echo ${BEST_EFFORT_EXCLUDED_NODES} | sed 's/,/ /g'))"
+else
+  TO_EXCLUDE=""
+fi
+  
 for h in ${TO_EXCLUDE}; do
   EXCLUDED_HOSTS="${EXCLUDED_HOSTS},'${h}.${G5K_SITE}'"
 done
-EXCLUDED_HOSTS="$(echo ${EXCLUDED_HOSTS} | cut -b2-)"
-oarsub -l "{cluster='${BEST_EFFORT_CLUSTER}' and host not in (${EXCLUDED_HOSTS})}/nodes=1,walltime=12" -t deploy -t besteffort ${SCRIPT_DIR}/03-deploy_besteffort_nodes.sh
+
+oarsub -l "{cluster='${BEST_EFFORT_CLUSTER}' ${TO_EXCLUDE}}/nodes=1,walltime=12" -t deploy -t besteffort ${SCRIPT_DIR}/03-deploy_besteffort_nodes.sh