Fix problems, with handling of uneven number of channels