close #405 for the server code