fix server.cpp too