Use on-tap instead of on-click