Fixed the switches