Batchset generator fixed