removing the swap animation
bug fix