Compat: Use correct batch number