Fixed server parsing