Tiny modification on server determination