fix structure and job bug