regression: missing batch id after last big refactoring