Tap check fix