Fix Swap Code