Fix x and y mixup