Fix to new model batch