Fixed coordinate swapper bug