Fix issue with SWAP