Fix the switch