patch server-side guest support... again