Fix switch statements again!