Fixed switch stuff.