Fix bug (swipe != null)