Fix bug with switcher
initial version