Fix button tapping