Fix all current known multi-channel wrong order problems by adding