Fix issue with taps