Fixed some swapping bugs