Fixing the batchset run loop