fixed default case when specifying the server