Fixing switcher click selection