Found bug of double-batch-numbers, inserted todo where it should be fixed