TIDY: Discover server.
FIX: Use discover server correctly.