small improvement about the servr