Batch init fix