fixes switcher