Fix column mixup