Yet another job-related bug fixed