Fix swipe and click event