Fix NewServer bug