This should fix FS#10917, and also fix channel swapping i introduced in r23784. Lets...