Fix a race condition involving server routing