swap issue solved