Fixed X and Y being reversed