If swap requires a wrap function then correctly use the wrapped address

If swap requires a wrap function then correctly use the wrapped address #652