fix in `BaseServer`