Restores previous behaviour for obtaining batch output

As the solution for batches where the outputs are not in same batch can't be used as a general solution, this fix restores the previous behaviour to the system.