Fix Tap/Click Issues