Batches adding bug fix