Fix mixup of x/y