Fixing bug with non swipes;