diff --git a/bin/cdist-mass-deploy b/bin/cdist-mass-deploy
index b78c032b..3d497436 100755
--- a/bin/cdist-mass-deploy
+++ b/bin/cdist-mass-deploy
@@ -53,14 +53,14 @@ done
 # else wait after all are started
 if [ "$parallel" ]; then
    __cdist_echo info "Waiting for cdist-deploy-to jobs to finish"
-   while [ "$i" -gt 0 ]; do
+   while [ "$i" -ge 0 ]; do
+      i=$((i-1))
       eval pid=\$pid_$i
       eval host=\$host_$i
       wait "$pid"
       if [ $? -ne 0 ]; then
          __cdist_echo error "Configuration of host $host failed."
       fi
-      i=$((i-1))
       shift
    done
 fi