Fix singleTap/Tap events