Fix switch field