Job id bugfix