Fix bug with intermittent server visibility