Fix the status tracking in job