fixed waitForServer and its usage