Fixed Swapping bug :D