Fixed an issue with Batch functions