Quick Swipe fix attempt 2.5