fixed unswap glitch