diff --git a/binarycpython/utils/HPC.py b/binarycpython/utils/HPC.py
index 57053bd23c497edcab1afa15aeb414bcd3d0ce43..9220a23cbd5ad3129c40c467b73b8ba50822329f 100644
--- a/binarycpython/utils/HPC.py
+++ b/binarycpython/utils/HPC.py
@@ -301,7 +301,8 @@ class HPC(condor,slurm):
         status = self.HPC_get_status()
         print("Job status",status)
 
-        if self.grid_options['HPC_force_join'] != 0 or status != "finished":
+        if self.grid_options['HPC_force_join'] == 0 and \
+           status != "finished":
             # job did not finish : save a snapshot
             print("This job did not finish (status is {status}) : cannot join".format(status=status))
         else: