Fixed Stupid Swap Bug