Fixed swiping edge cases