Fix switcher status not right