bug fix for switcher