Working on a fix for batch jobs