Fixed X/Y mixup