SWAP finally fixed