QuerySingleServer Problem (Fixed)

I fixed the pull request.

Work around for Issue #418