Fixed x2 -> y2