Fixed switcher behaviour