Attempt to fix duplicate jobs (again)