an attempt to fix the server select bug.
Merge pull request #240 from regneq/master

an attempt to fix the server select bug.