fixe bug of switcher