Fixed job id null issue