more switches fixing