Fixed swapped x and y axis issue