Fix switch public access