Fix bug on Swipe