job_id condition corrected