fixed server parsing