Job2 bug fix