BATCH-2223: fixed numbering