Fixed freezing issue with fast swipes