Fixed the right/to location swapping