fix for switcher class