List mixup fix