Merge "Fix a bug that job might not be able to be started properly."