Fixed switch bug - I think