Fixed swipe showing incorrect swipe status