Fix touch and swipe firing