Hope this is the final fix

One too much inversion of x and y