Fix for swipe issue