Fixed batch bug