QuerySingleServer Problem

Work around for Issue #418