Tap events now get the actual target