Final switch fix hooray