Fixed creation of jobs