temp fix
adapt the batch