[1/2]Fix for Swipe to switch