Fixed swtch not being recognized