Batch bug fix