Fix x/y mapping