Fixing the swap