Fixed bug where turns were not being completely swapped